diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-19 17:55:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-19 17:55:01 +0000 |
| commit | 9dc905b80e1d5765ae72e9e76070761fc5c243a8 (patch) | |
| tree | 32de25c668d592c59710db913aeb20006144a4d3 /compose | |
| parent | 760fdfde8fe7361f5ae370f4e2c8fbf421e941ba (diff) | |
| parent | 72d1ef47ddc5e44868c56633707b346281e9d41a (diff) | |
| download | kolla-9dc905b80e1d5765ae72e9e76070761fc5c243a8.tar.gz kolla-9dc905b80e1d5765ae72e9e76070761fc5c243a8.zip | |
Merge "Add cinder into the docker compose setup"
Diffstat (limited to 'compose')
| -rw-r--r-- | compose/cinder-api-scheduler.yml | 15 | ||||
| -rw-r--r-- | compose/cinder-backup.yml | 9 | ||||
| -rw-r--r-- | compose/cinder-volume.yml | 18 | ||||
| -rw-r--r-- | compose/nova-compute-network.yml | 2 | ||||
| -rw-r--r-- | compose/nova-compute.yml | 2 |
5 files changed, 46 insertions, 0 deletions
diff --git a/compose/cinder-api-scheduler.yml b/compose/cinder-api-scheduler.yml new file mode 100644 index 000000000..86bbf53b6 --- /dev/null +++ b/compose/cinder-api-scheduler.yml @@ -0,0 +1,15 @@ +cinderapi: + image: kollaglue/centos-rdo-cinder-api:latest + name: cinder-api + net: host + restart: always + env_file: + - openstack.env + +cinderscheduler: + image: kollaglue/centos-rdo-cinder-scheduler:latest + name: cinder-scheduler + net: host + restart: always + env_file: + - openstack.env diff --git a/compose/cinder-backup.yml b/compose/cinder-backup.yml new file mode 100644 index 000000000..b7c82f339 --- /dev/null +++ b/compose/cinder-backup.yml @@ -0,0 +1,9 @@ +cinderbackup: + image: kollaglue/centos-rdo-cinder-backup:latest + name: cinder-backup + net: host + restart: always + env_file: + - openstack.env + volumes: + - /dev:/dev diff --git a/compose/cinder-volume.yml b/compose/cinder-volume.yml new file mode 100644 index 000000000..a1d601acf --- /dev/null +++ b/compose/cinder-volume.yml @@ -0,0 +1,18 @@ +cinderdata: + image: kollaglue/centos-rdo-cinder-data:latest + name: cinderdata + restart: on-failure + +cindervolume: + image: kollaglue/centos-rdo-cinder-volume:latest + name: cinder-volume + net: host + privileged: true + restart: always + env_file: + - openstack.env + volumes: + - /lib/modules:/lib/modules:ro + - /dev:/dev + volumes_from: + - cinderdata diff --git a/compose/nova-compute-network.yml b/compose/nova-compute-network.yml index 1f6392c5f..7b8781e5f 100644 --- a/compose/nova-compute-network.yml +++ b/compose/nova-compute-network.yml @@ -14,6 +14,7 @@ libvirt: volumes: - /run:/run - /sys/fs/cgroup:/sys/fs/cgroup + - /dev:/dev volumes_from: - computedata @@ -43,5 +44,6 @@ novacompute: volumes: - /run:/run - /sys/fs/cgroup:/sys/fs/cgroup + - /dev:/dev volumes_from: - computedata diff --git a/compose/nova-compute.yml b/compose/nova-compute.yml index 766db52e9..297b5cf10 100644 --- a/compose/nova-compute.yml +++ b/compose/nova-compute.yml @@ -15,6 +15,7 @@ libvirt: - /run:/run - /sys/fs/cgroup:/sys/fs/cgroup - /lib/modules:/lib/modules:ro + - /dev:/dev volumes_from: - computedata @@ -30,5 +31,6 @@ novacompute: - /run:/run - /sys/fs/cgroup:/sys/fs/cgroup - /lib/modules:/lib/modules:ro + - /dev:/dev volumes_from: - computedata |