diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-19 03:22:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-19 03:22:51 +0000 |
| commit | ac61653343536017b20182e75bc66228bc4da79f (patch) | |
| tree | b99f3ee99f35f0d8a58522787085240319cf13a5 | |
| parent | 718db54fa80bbd892670a7a5c1eca5ad991f53eb (diff) | |
| parent | 3c5165687afd5f0e7743477c2e69ed6ae27c10a4 (diff) | |
| download | kolla-ac61653343536017b20182e75bc66228bc4da79f.tar.gz kolla-ac61653343536017b20182e75bc66228bc4da79f.zip | |
Merge "Cinder bootstrap container is not initializing the DB"
| -rw-r--r-- | ansible/roles/cinder/tasks/bootstrap.yml | 4 | ||||
| -rwxr-xr-x | docker/common/cinder/cinder-api/start.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml index 2fc62c2e9..e157ce5ec 100644 --- a/ansible/roles/cinder/tasks/bootstrap.yml +++ b/ansible/roles/cinder/tasks/bootstrap.yml @@ -58,11 +58,11 @@ insecure_registry: "{{ docker_insecure_registry }}" name: bootstrap_cinder image: "{{ cinder_api_image_full }}" - volumes: "{{ node_config_directory }}/cinder/:/opt/kolla/cinder/:ro" + volumes: "{{ node_config_directory }}/cinder-api/:/opt/kolla/cinder-api/:ro" volumes_from: - cinder_data env: - KOLLA_BOOSTRAP: + KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" run_once: True when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed diff --git a/docker/common/cinder/cinder-api/start.sh b/docker/common/cinder/cinder-api/start.sh index e6f79b3a6..ac1774b37 100755 --- a/docker/common/cinder/cinder-api/start.sh +++ b/docker/common/cinder/cinder-api/start.sh @@ -14,7 +14,7 @@ set_configs # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - su -s /bin/sh -c "cinder-manage db_sync" cinder + su -s /bin/sh -c "cinder-manage db sync" cinder exit 0 fi |