add nova-novncproxy to controller

Author: jasoncolburne

src/core-switch/scripts/openstack/yoga/down.sh

@@ -21,4 +21,4 @@ do
   sudo systemctl stop ${SERVICE}
 done
 
-sudo systemctl stop nova-scheduler nova-conductor
+sudo systemctl stop nova-scheduler nova-conductor nova-novncproxy

src/core-switch/scripts/openstack/yoga/nodes/controller/dependencies/compute.sh

@@ -2,4 +2,6 @@
 
 set -euo pipefail
 
-apt-get -y install libvirt-dev
+apt-get -y install \
+  libvirt-dev \
+  novnc

src/core-switch/scripts/openstack/yoga/nodes/controller/deploy/compute.sh

@@ -287,5 +287,22 @@ WorkingDirectory=/var/lib/nova
 WantedBy=multi-user.target
 EOF
 
+sudo tee /lib/systemd/system/nova-novncproxy.service << EOF
+[Unit]
+Description=Openstack Compute Controller No VNC Proxy
+After=network.target
+
+[Service]
+Environment=REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
+NetworkNamespacePath=/run/netns/os-ctrl
+ExecStart=/var/lib/nova/venv/bin/nova-novncproxy
+User=nova
+Group=nova
+WorkingDirectory=/var/lib/nova
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
 sudo systemctl daemon-reload
-sudo systemctl restart nova-scheduler nova-conductor
+sudo systemctl restart nova-scheduler nova-conductor nova-novncproxy

src/core-switch/scripts/openstack/yoga/nodes/controller/reset/compute.sh

@@ -4,7 +4,8 @@ set -euo pipefail
 
 sudo systemctl stop nova-scheduler || true
 sudo systemctl stop nova-conductor || true
-sudo rm -f /lib/systemd/system/nova-scheduler.service /lib/systemd/system/nova-conductor.service
+sudo systemctl stop nova-novncproxy || true
+sudo rm -f /lib/systemd/system/nova-{scheduler,conductor,novncproxy}.service
 sudo systemctl daemon-reload
 
 sudo systemctl stop os-fwd-${SERVICE} nginx-ctrl uwsgi-${SERVICE} || true

src/core-switch/scripts/openstack/yoga/up.sh

@@ -7,7 +7,7 @@ else
   set -euo pipefail
 fi
 
-sudo systemctl restart nova-scheduler nova-conductor
+sudo systemctl restart nova-scheduler nova-conductor nova-novncproxy
 for SERVICE_PATH in /lib/systemd/system/uwsgi-*
 do
   SERVICE=$(basename ${SERVICE_PATH})

src/core-switch/scripts/status.sh

@@ -20,6 +20,7 @@ sudo systemctl status \
   uwsgi-nova \
   nova-scheduler \
   nova-conductor \
+  nova-novncproxy \
   memcached \
   rabbitmq-server \
   zookeeper \