aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrthallisey <rhallise@redhat.com>2015-08-17 15:57:13 -0400
committerrthallisey <rhallise@redhat.com>2015-08-18 09:35:23 -0400
commit3c5165687afd5f0e7743477c2e69ed6ae27c10a4 (patch)
tree20bbcdc2d6938e61336e581cc86b18e23ff53211
parent8057fa793863d9c05cfba999287e59c194d93ee5 (diff)
downloadkolla-3c5165687afd5f0e7743477c2e69ed6ae27c10a4.tar.gz
kolla-3c5165687afd5f0e7743477c2e69ed6ae27c10a4.zip
Cinder bootstrap container is not initializing the DB
When running cinder-ansible, the cinder db is never being initialized. The bootstrap task needs to be fixed in order for cinder to run the db sync. Change-Id: I01c5f5c34773ffc4e4f7fc7088a7277115db94dc Closes-Bug: #1485745
-rw-r--r--ansible/roles/cinder/tasks/bootstrap.yml4
-rwxr-xr-xdocker/common/cinder/cinder-api/start.sh2
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