From 5ffc66cd69e1cda087056da25ab25548dacb1d32 Mon Sep 17 00:00:00 2001
From: Harm Weites <harm@weites.com>
Date: Tue, 5 May 2015 00:37:23 +0200
Subject: 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
---
 ...-conductor-scheduler-consoleauth-novncproxy.yml | 42 ++++++++++++++++++++++
 compose/nova-api-conductor-scheduler.yml           | 26 --------------
 2 files changed, 42 insertions(+), 26 deletions(-)
 create mode 100644 compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml
 delete mode 100644 compose/nova-api-conductor-scheduler.yml

(limited to 'compose')

diff --git a/compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml b/compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml
new file mode 100644
index 000000000..17b583d2e
--- /dev/null
+++ b/compose/nova-api-conductor-scheduler-consoleauth-novncproxy.yml
@@ -0,0 +1,42 @@
+novaconductor:
+  image: kollaglue/centos-rdo-nova-conductor:juno
+  name: nova-conductor
+  net: "host"
+  restart: always
+  env_file:
+   - openstack.env
+
+# Unfortunately nova api needs to be privileged as it wants to run
+# a firewall command.
+novaapi:
+  image: kollaglue/centos-rdo-nova-api:juno
+  name: nova-api
+  privileged: True
+  net: "host"
+  restart: always
+  env_file:
+   - openstack.env
+
+novascheduler:
+  image: kollaglue/centos-rdo-nova-scheduler:juno
+  name: nova-scheduler
+  net: "host"
+  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
diff --git a/compose/nova-api-conductor-scheduler.yml b/compose/nova-api-conductor-scheduler.yml
deleted file mode 100644
index 4415f72f4..000000000
--- a/compose/nova-api-conductor-scheduler.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-novaconductor:
-  image: kollaglue/centos-rdo-nova-conductor:juno
-  name: nova-conductor
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-
-# Unfortunately nova api needs to be privileged as it wants to run
-# a firewall command.
-novaapi:
-  image: kollaglue/centos-rdo-nova-api:juno
-  name: nova-api
-  privileged: True
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-
-novascheduler:
-  image: kollaglue/centos-rdo-nova-scheduler:juno
-  name: nova-scheduler
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-- 
cgit v1.2.3