diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-17 21:52:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-17 21:52:45 +0000 |
| commit | cdfb9eb4b26d59d246efc34869f86a5ebf8a0e0b (patch) | |
| tree | 2c57b681cec2aea73a3a04e7888b2a191460e30e | |
| parent | 5a978f51391a517fc1464c54ec0a8ff7e90448da (diff) | |
| parent | a6f3a1073a50049e505f12c202f6acbb7f042281 (diff) | |
| download | kolla-cdfb9eb4b26d59d246efc34869f86a5ebf8a0e0b.tar.gz kolla-cdfb9eb4b26d59d246efc34869f86a5ebf8a0e0b.zip | |
Merge "Fix volumes_from for the ansible playbooks"
| -rw-r--r-- | ansible/roles/cinder/tasks/bootstrap.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/glance/tasks/bootstrap.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/glance/tasks/start.yml | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml index 3a6062e9a..2fc62c2e9 100644 --- a/ansible/roles/cinder/tasks/bootstrap.yml +++ b/ansible/roles/cinder/tasks/bootstrap.yml @@ -59,7 +59,8 @@ name: bootstrap_cinder image: "{{ cinder_api_image_full }}" volumes: "{{ node_config_directory }}/cinder/:/opt/kolla/cinder/:ro" - volumes_from: cinder_data + volumes_from: + - cinder_data env: KOLLA_BOOSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" diff --git a/ansible/roles/glance/tasks/bootstrap.yml b/ansible/roles/glance/tasks/bootstrap.yml index 112531518..f8d3c6534 100644 --- a/ansible/roles/glance/tasks/bootstrap.yml +++ b/ansible/roles/glance/tasks/bootstrap.yml @@ -59,7 +59,8 @@ name: bootstrap_glance image: "{{ glance_api_image_full }}" volumes: "{{ node_config_directory }}/glance-api/:/opt/kolla/glance-api/:ro" - volumes_from: glance_data + volumes_from: + - glance_data env: KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" diff --git a/ansible/roles/glance/tasks/start.yml b/ansible/roles/glance/tasks/start.yml index 3d7306916..755526249 100644 --- a/ansible/roles/glance/tasks/start.yml +++ b/ansible/roles/glance/tasks/start.yml @@ -14,7 +14,8 @@ name: glance_registry image: "{{ glance_registry_image_full }}" volumes: "{{ node_config_directory }}/glance-registry/:/opt/kolla/glance-registry/:ro" - volumes_from: glance_data + volumes_from: + - glance_data env: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" when: inventory_hostname in groups['glance-registry'] |