summaryrefslogtreecommitdiffstats
path: root/meta-ibm/recipes-phosphor
diff options
context:
space:
mode:
authorEd Tanous <ed.tanous@intel.com>2018-09-28 14:15:49 -0700
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-02-01 09:22:39 -0500
commit3a81465255b76f2e917a8640ee401b39eda99a00 (patch)
tree0b5a9c14622379623020d8221c8f41999e7546d5 /meta-ibm/recipes-phosphor
parent9c3a55209a731004c2f8bd79e91b398ee195cc67 (diff)
downloadtalos-openbmc-3a81465255b76f2e917a8640ee401b39eda99a00.tar.gz
talos-openbmc-3a81465255b76f2e917a8640ee401b39eda99a00.zip
meta-ibm: remove nginx from IBM platforms.
Nginx on OpenBMC has a number of issues that matter to openbmc. 1. It increases the binary size. This is an issue given that OpenBMC targets a relatively minimal flash footprint. 2. It increases the runtime overhead. Running nginx as a reverse proxy to the application servers causes a runtime overhead, and context switch for every single page load, as well as an extra socket. 3. nginx doesn't implement any kind of authentication, so auth needs to be implemented in every application server. This removes a lot of the advantages of the reverse proxy, and duplicates a lot of code amongst multiple application servers 4. A number of nginx parameters run from the nginx config file. Some of these parameters (like cipher suite support) are desired to be changed at runtime, rather than fixed at compile time. Related to commit here to move system to bmcweb: https://gerrit.openbmc-project.xyz/#/c/openbmc/meta-phosphor/+/12933/ (From meta-ibm rev: b6639a209f0089864bef4fc86dcad97880bce682) Change-Id: I21848eb3a8dfa85968c6c96d6a78f5145402db1d Signed-off-by: Ed Tanous <ed.tanous@intel.com> (cherry picked from commit 699e296eb0dbd421bcb2fff4be9d446f47ae7195) Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ibm/recipes-phosphor')
-rw-r--r--meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend3
-rw-r--r--meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.service11
-rw-r--r--meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.socket8
3 files changed, 2 insertions, 20 deletions
diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 0b0a9c9f2..27c647a07 100644
--- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,2 +1,3 @@
RDEPENDS_${PN}-logging += "ibm-logging"
-RDEPENDS_${PN}-extras += "nginx bmcweb"
+RDEPENDS_${PN}-extras += " bmcweb"
+RDEPENDS_${PN}-remove += " phosphor-rest phosphor-gevent"
diff --git a/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.service b/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.service
deleted file mode 100644
index 6b4e77ffe..000000000
--- a/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Phosphor REST Server
-After=network.target
-After=obmc-webserver-pre.target
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/env phosphor-gevent $APPLICATION --no-ssl
-SyslogIdentifier=phosphor-gevent
-Environment="PYTHONUNBUFFERED=1"
-EnvironmentFile={envfiledir}/obmc/wsgi_app
diff --git a/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.socket b/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.socket
deleted file mode 100644
index f7fde31be..000000000
--- a/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Phosphor Webserver socket
-
-[Socket]
-ListenStream=127.0.0.1:8081
-
-[Install]
-WantedBy=sockets.target
OpenPOWER on IntegriCloud