summaryrefslogtreecommitdiff
path: root/compose
diff options
context:
space:
mode:
authorHarm Weites <harm@weites.com>2015-05-05 00:37:23 +0200
committerHarm Weites <harm@weites.com>2015-05-06 22:32:38 +0200
commit5ffc66cd69e1cda087056da25ab25548dacb1d32 (patch)
tree180456a11c01670e6794078938ed38bd37af8fa2 /compose
parentd19adb6a6b861147de3235c6867953d872e3aeec (diff)
downloadkolla-5ffc66cd69e1cda087056da25ab25548dacb1d32.tar.gz
kolla-5ffc66cd69e1cda087056da25ab25548dacb1d32.zip
Add a novnc container running the novnc-proxy.
All VNC-specific configuration bits are moved from nova-api-base to nova-compute and the new nova-novncproxy and nova-consoleauth containers. The compose specification has been updated to reflect this. A future patch will make the desired backend configurable (spice/vnc). Change-Id: I8b64abf125fd1ecd7d3463515e3717dd9bd60420 Blueprint: novnc-container
Diffstat (limited to 'compose')
-rw-r--r--compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml (renamed from compose/nova-api-conductor-scheduler.yml)16
1 files changed, 16 insertions, 0 deletions
diff --git a/compose/nova-api-conductor-scheduler.yml b/compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml
index 4415f72f4..17b583d2e 100644
--- a/compose/nova-api-conductor-scheduler.yml
+++ b/compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml
@@ -24,3 +24,19 @@ novascheduler:
restart: always
env_file:
- openstack.env
+
+novaconsoleauth:
+ image: kollaglue/centos-rdo-nova-consoleauth:juno
+ name: nova-consoleauth
+ net: "host"
+ restart: always
+ env_file:
+ - openstack.env
+
+novanovncproxy:
+ image: kollaglue/centos-rdo-nova-novncproxy:juno
+ name: nova-novncproxy
+ net: "host"
+ restart: always
+ env_file:
+ - openstack.env