openstack/kolla-ansible
Code Issues Proposed changes

Merge "Cinder bootstrap container is not initializing the DB"

Browse Source
This commit is contained in:
Jenkins 2015-08-19 03:22:51 +00:00 committed by Gerrit Code Review
commit ac61653343
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/cinder/tasks/bootstrap.yml
View File

@ -58,11 +58,11 @@
insecure_registry: "{{ docker_insecure_registry }}" insecure_registry: "{{ docker_insecure_registry }}"
name: bootstrap_cinder name: bootstrap_cinder
image: "{{ cinder_api_image_full }}" 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: volumes_from:
- cinder_data - cinder_data
env: env:
KOLLA_BOOSTRAP: KOLLA_BOOTSTRAP:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
run_once: True run_once: True
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed

2
docker/common/cinder/cinder-api/start.sh
View File

@ -14,7 +14,7 @@ set_configs
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty. # of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then 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 exit 0
fi fi