New nova compute and nova network yml file for docker compose.

This one uses the single environment file and has a few changes to mounted directories. Change-Id: I047a92b5ab89aa9b3b75213c19e05eb84d48adf6
2015-03-12 13:20:13 -07:00 · 2015-03-12 13:20:13 -07:00 · c2bdaadd7c
commit c2bdaadd7c
parent 7a23a94f9c
2 changed files with 47 additions and 64 deletions
--- a/compose/nova-compute-network.yml
+++ b/compose/nova-compute-network.yml
@ -0,0 +1,47 @@
+libvirt:
+   image: kollaglue/centos-rdo-nova-libvirt
+   name: libvirt
+   net: host
+   privileged: true
+   restart: always
+   env_file:
+    - openstack.env
+   volumes:
+    - /run:/run
+    - /sys/fs/cgroup:/sys/fs/cgroup
+    - /var/lib/nova:/var/lib/nova
+    - /var/lib/libvirt:/var/lib/libvirt
+    - /etc/libvirt/qemu:/etc/libvirt/qemu
+    - /etc/libvirt/nwfilters:/etc/libvirt/nwfilters
+
+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
+    - /var/lib/nova:/var/lib/nova
+    - /var/lib/libvirt:/var/lib/libvirt
+    - /etc/libvirt/nwfilters:/etc/libvirt/nwfilters
+
+novacompute:
+   image: kollaglue/centos-rdo-nova-compute
+   name: nova-compute
+   net: host
+   pid: host
+   privileged: true
+   restart: always
+   env_file:
+    - openstack.env
+   volumes:
+    - /run:/run
+    - /sys/fs/cgroup:/sys/fs/cgroup
+    - /var/lib/nova:/var/lib/nova
+    - /var/lib/libvirt:/var/lib/libvirt
+    - /etc/libvirt/qemu:/etc/libvirt/qemu
+    - /etc/libvirt/nwfilters:/etc/libvirt/nwfilters
--- a/compose/nova-compute-nova-net.yml
+++ b/compose/nova-compute-nova-net.yml
@ -1,64 +0,0 @@
-libvirt:
-   image: kollaglue/centos-rdo-nova-libvirt
-   net: host
-   pid: host
-   privileged: true
-   volumes:
-    - /run:/run
-    - /sys/fs/cgroup:/sys/fs/cgroup
-    - /var/lib/nova:/var/lib/nova
-    - /var/lib/libvirt:/var/lib/libvirt
-    - /etc/libvirt/nwfilter:/etc/libvirt/nwfilter
-network:
-   image: kollaglue/centos-rdo-nova-network
-   net: host
-   privileged: true
-   environment:
-      FLAT_INTERFACE: enp2s0f1
-      PUBLIC_INTERFACE: eno1
-      NETWORK_MANAGER: nova
-      NOVA_DB_USER: nova
-      NOVA_DB_PASSWORD: 123456
-      NOVA_KEYSTONE_USER: admin
-      NOVA_KEYSTONE_PASSWORD: 123456
-      ADMIN_TENANT_NAME: admin
-      RABBIT_USERID: guest
-      RABBIT_PASSWORD: 123456
-      NETWORK_MANAGER: nova
-      GLANCE_API_SERVICE_HOST: 192.168.1.100
-      KEYSTONE_PUBLIC_SERVICE_HOST: 192.168.1.100
-      RABBITMQ_SERVICE_HOST: 192.168.1.100
-      NOVA_KEYSTONE_PASSWORD: 123456
-      KEYSTONE_ADMIN_TOKEN: 123456
-   volumes:
-    - /run:/run
-    - /sys/fs/cgroup:/sys/fs/cgroup
-    - /var/lib/nova:/var/lib/nova
-    - /var/lib/libvirt:/var/lib/libvirt
-compute:
-   image: kollaglue/centos-rdo-nova-compute
-   net: host
-   privileged: true
-   environment:
-      FLAT_INTERFACE: enp2s0f1
-      PUBLIC_INTERFACE: eno1
-      NETWORK_MANAGER: nova
-      NOVA_DB_USER: nova
-      NOVA_DB_PASSWORD: 123456
-      NOVA_KEYSTONE_USER: admin
-      NOVA_KEYSTONE_PASSWORD: 123456
-      ADMIN_TENANT_NAME: admin
-      RABBIT_USERID: guest
-      RABBIT_PASSWORD: 123456
-      NETWORK_MANAGER: nova
-      GLANCE_API_SERVICE_HOST: 192.168.1.100
-      KEYSTONE_PUBLIC_SERVICE_HOST: 192.168.1.100
-      RABBITMQ_SERVICE_HOST: 192.168.1.100
-      NOVA_KEYSTONE_PASSWORD: 123456
-      KEYSTONE_ADMIN_TOKEN: 123456
-   volumes:
-    - /run:/run
-    - /sys/fs/cgroup:/sys/fs/cgroup
-    - /var/lib/nova:/var/lib/nova
-    - /var/lib/libvirt:/var/lib/libvirt
-    - /etc/libvirt/nwfilter:/etc/libvirt/nwfilter