diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-15 02:48:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-15 02:48:49 +0000 |
| commit | 9ed6712bd19b9392f2e34b848ee8388c70c8e554 (patch) | |
| tree | b5b546a9d8579c3943eab2d3078556616c7fcd01 | |
| parent | 07924c9ade87f0cfa1edd0fdf99237213c34d317 (diff) | |
| parent | c37d1d25bc39a9b5a09a03093e830abbaef27658 (diff) | |
| download | kolla-9ed6712bd19b9392f2e34b848ee8388c70c8e554.tar.gz kolla-9ed6712bd19b9392f2e34b848ee8388c70c8e554.zip | |
Merge "Load the metadata definitions during Glance bootstrap"
| -rw-r--r-- | ansible/roles/glance/tasks/do_reconfigure.yml | 2 | ||||
| -rw-r--r-- | docker/glance/glance-api/extend_start.sh | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/ansible/roles/glance/tasks/do_reconfigure.yml b/ansible/roles/glance/tasks/do_reconfigure.yml index ae685dd0e..d9e167867 100644 --- a/ansible/roles/glance/tasks/do_reconfigure.yml +++ b/ansible/roles/glance/tasks/do_reconfigure.yml @@ -43,6 +43,8 @@ - container_envs.results - check_results.results +- include: bootstrap_service.yml + - include: start.yml when: remove_containers.changed diff --git a/docker/glance/glance-api/extend_start.sh b/docker/glance/glance-api/extend_start.sh index 4b99201c9..be4b83961 100644 --- a/docker/glance/glance-api/extend_start.sh +++ b/docker/glance/glance-api/extend_start.sh @@ -4,6 +4,7 @@ # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then glance-manage db_sync + glance-manage db_load_metadefs sudo chown -R glance: /var/lib/glance/ exit 0 fi |
