From c2bdaadd7cdff5c428b8169f5ffa6da23a4ea072 Mon Sep 17 00:00:00 2001 From: Ian Main Date: Thu, 12 Mar 2015 13:20:13 -0700 Subject: [PATCH] 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 --- compose/nova-compute-network.yml | 47 +++++++++++++++++++++++ compose/nova-compute-nova-net.yml | 64 ------------------------------- 2 files changed, 47 insertions(+), 64 deletions(-) create mode 100644 compose/nova-compute-network.yml delete mode 100644 compose/nova-compute-nova-net.yml diff --git a/compose/nova-compute-network.yml b/compose/nova-compute-network.yml new file mode 100644 index 0000000000..5e9fca2d1a --- /dev/null +++ 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 diff --git a/compose/nova-compute-nova-net.yml b/compose/nova-compute-nova-net.yml deleted file mode 100644 index 9a72b7552c..0000000000 --- a/compose/nova-compute-nova-net.yml +++ /dev/null @@ -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