diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml index 2fc62c2e9f..e157ce5ec5 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 e6f79b3a65..ac1774b37a 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