aboutsummaryrefslogtreecommitdiff
path: root/compose
diff options
context:
space:
mode:
authorDaneyon Hansen <danehans@cisco.com>2015-03-24 18:29:30 +0000
committerDaneyon Hansen <danehans@cisco.com>2015-03-25 17:27:44 +0000
commit1182e060cb721db124e825e2447d0a27b9946bc9 (patch)
treea2e91486e8f273d08c7747166e9f033e1543118d /compose
parent81d65f0b3d7098366234cf292595fe513b1c9b98 (diff)
downloadkolla-1182e060cb721db124e825e2447d0a27b9946bc9.tar.gz
kolla-1182e060cb721db124e825e2447d0a27b9946bc9.zip
Extends Nova Metadata Service Parameterization and Composition
Previously, nova enabled_apis was hard coded and metdata_host was using PUBLIC_IP param instead of exposing an individual param. Extending these params and creating a separate compose yml that includes compute/libvirt/network/api is required to support nova network multi_host. Additional details can be found here: http://docs.openstack.org/admin-guide-cloud/content/section_metadata-service.html Change-Id: I5d417a0ee460f8ad9b2982fe83d63ab57013918e
Diffstat (limited to 'compose')
-rw-r--r--compose/nova-api-compute-network.yml59
1 files changed, 59 insertions, 0 deletions
diff --git a/compose/nova-api-compute-network.yml b/compose/nova-api-compute-network.yml
new file mode 100644
index 000000000..8e0c4c08f
--- /dev/null
+++ b/compose/nova-api-compute-network.yml
@@ -0,0 +1,59 @@
+computedata:
+ image: kollaglue/centos-rdo-nova-compute-data
+ name: computedata
+
+libvirt:
+ image: kollaglue/centos-rdo-nova-libvirt
+ name: libvirt
+ net: host
+ pid: host
+ privileged: true
+ restart: always
+ env_file:
+ - openstack.env
+ volumes:
+ - /run:/run
+ - /sys/fs/cgroup:/sys/fs/cgroup
+ volumes_from:
+ - computedata
+
+novanetwork:
+ image: kollaglue/centos-rdo-nova-network
+ name: nova-network
+ net: host
+ privileged: true
+ restart: always
+ env_file:
+ - openstack.env
+ volumes:
+ - /run:/run
+ - /sys/fs/cgroup:/sys/fs/cgroup
+ volumes_from:
+ - computedata
+
+# Unfortunately nova api needs to be privileged as it wants to run
+# a firewall command.
+# nova-metadata api is required in multi_host nova network mode.
+# http://docs.openstack.org/admin-guide-cloud/content/section_metadata-service.html
+novaapi:
+ image: kollaglue/centos-rdo-nova-api:latest
+ name: nova-api
+ privileged: True
+ net: "host"
+ restart: always
+ env_file:
+ - openstack.env
+
+novacompute:
+ image: kollaglue/centos-rdo-nova-compute
+ name: nova-compute
+ net: host
+ privileged: true
+ restart: always
+ env_file:
+ - openstack.env
+ volumes:
+ - /run:/run
+ - /sys/fs/cgroup:/sys/fs/cgroup
+ volumes_from:
+ - computedata