diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-25 08:46:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-25 08:46:27 +0000 |
| commit | eb05118a3ffd4e0e9fc622a82aa07eb27e7fd723 (patch) | |
| tree | 0af199fe9a980a83c66d1755c79255edebfa99d7 /compose | |
| parent | 9911f75789dd424abe8f4f4926bec7c9d2fafcbe (diff) | |
| parent | f1dbf2579748d073718b7b38a76f884d5b2c8361 (diff) | |
| download | kolla-eb05118a3ffd4e0e9fc622a82aa07eb27e7fd723.tar.gz kolla-eb05118a3ffd4e0e9fc622a82aa07eb27e7fd723.zip | |
Merge "WIP: Remove data containers and adjust compose files"
Diffstat (limited to 'compose')
| -rw-r--r-- | compose/cinder-volume.yml | 2 | ||||
| -rw-r--r-- | compose/designate.yml | 2 | ||||
| -rw-r--r-- | compose/galeradb.yml | 4 | ||||
| -rw-r--r-- | compose/glance-api-registry.yml | 2 | ||||
| -rw-r--r-- | compose/mariadb.yml | 2 | ||||
| -rw-r--r-- | compose/nova-api-compute-network.yml | 2 | ||||
| -rw-r--r-- | compose/nova-compute-network.yml | 2 | ||||
| -rw-r--r-- | compose/nova-compute.yml | 2 | ||||
| -rw-r--r-- | compose/swift-storage.yml | 2 |
9 files changed, 11 insertions, 9 deletions
diff --git a/compose/cinder-volume.yml b/compose/cinder-volume.yml index a1d601acf..005e19ed7 100644 --- a/compose/cinder-volume.yml +++ b/compose/cinder-volume.yml @@ -1,5 +1,5 @@ cinderdata: - image: kollaglue/centos-rdo-cinder-data:latest + image: kollaglue/centos-rdo-data:latest name: cinderdata restart: on-failure diff --git a/compose/designate.yml b/compose/designate.yml index 05ae7b53b..94b432bfa 100644 --- a/compose/designate.yml +++ b/compose/designate.yml @@ -28,7 +28,7 @@ designatepoolmanager: # Bind9 backend and state storage. designatebackendbind9data: - image: kollaglue/centos-rdo-designate-backend-bind9-data:latest + image: kollaglue/centos-rdo-data:latest name: designate-backend-bind9-data restart: on-failure diff --git a/compose/galeradb.yml b/compose/galeradb.yml index 2a40e37e7..740625524 100644 --- a/compose/galeradb.yml +++ b/compose/galeradb.yml @@ -1,5 +1,5 @@ galeradbdata: - image: kollaglue/centos-rdo-mariadb-data:latest + image: kollaglue/centos-rdo-data:latest name: galeradb-data restart: on-failure @@ -12,4 +12,4 @@ galeraapp: env_file: - openstack.env volumes_from: - - galeradbdata
\ No newline at end of file + - galeradbdata diff --git a/compose/glance-api-registry.yml b/compose/glance-api-registry.yml index 130020cd6..316e0ad4e 100644 --- a/compose/glance-api-registry.yml +++ b/compose/glance-api-registry.yml @@ -9,6 +9,8 @@ glanceregistry: restart: always env_file: - openstack.env + volumes_from: + - glancedata glanceapi: image: kollaglue/centos-rdo-glance-api:latest diff --git a/compose/mariadb.yml b/compose/mariadb.yml index 0736784f9..f20e8d718 100644 --- a/compose/mariadb.yml +++ b/compose/mariadb.yml @@ -1,5 +1,5 @@ mariadbdata: - image: kollaglue/centos-rdo-mariadb-data:latest + image: kollaglue/centos-rdo-data:latest name: mariadbdata restart: on-failure diff --git a/compose/nova-api-compute-network.yml b/compose/nova-api-compute-network.yml index e1f9d515f..6071d5bcd 100644 --- a/compose/nova-api-compute-network.yml +++ b/compose/nova-api-compute-network.yml @@ -1,5 +1,5 @@ computedata: - image: kollaglue/centos-rdo-nova-compute-data:latest + image: kollaglue/centos-rdo-data:latest name: computedata libvirt: diff --git a/compose/nova-compute-network.yml b/compose/nova-compute-network.yml index 7b8781e5f..106aa046e 100644 --- a/compose/nova-compute-network.yml +++ b/compose/nova-compute-network.yml @@ -1,5 +1,5 @@ computedata: - image: kollaglue/centos-rdo-nova-compute-data:latest + image: kollaglue/centos-rdo-data:latest name: computedata libvirt: diff --git a/compose/nova-compute.yml b/compose/nova-compute.yml index 297b5cf10..d75752618 100644 --- a/compose/nova-compute.yml +++ b/compose/nova-compute.yml @@ -1,5 +1,5 @@ computedata: - image: kollaglue/centos-rdo-nova-compute-data:latest + image: kollaglue/centos-rdo-data:latest name: computedata libvirt: diff --git a/compose/swift-storage.yml b/compose/swift-storage.yml index e790a5e71..35bebd69e 100644 --- a/compose/swift-storage.yml +++ b/compose/swift-storage.yml @@ -1,5 +1,5 @@ swiftdata: - image: kollaglue/centos-rdo-swift-data:latest + image: kollaglue/centos-rdo-data:latest name: swiftdata swiftobjectserver: |