diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-15 14:31:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-15 14:31:40 +0000 |
| commit | 81fbf246fd4fc0ff6d17b526ad540632091043b8 (patch) | |
| tree | 2cd7c249a81ac5eaa9167755f25c2383e9a94b3e | |
| parent | 3f064206b8572ab18587c380e9bcd59d1e6384fe (diff) | |
| parent | 26524c74753c1a20542d0aa9ba3a35c6bb430606 (diff) | |
| download | kolla-81fbf246fd4fc0ff6d17b526ad540632091043b8.tar.gz kolla-81fbf246fd4fc0ff6d17b526ad540632091043b8.zip | |
Merge "Playbook for keystone upgrade"
| -rw-r--r-- | ansible/roles/keystone/tasks/bootstrap.yml | 15 | ||||
| -rw-r--r-- | ansible/roles/keystone/tasks/bootstrap_service.yml | 15 | ||||
| -rw-r--r-- | ansible/roles/keystone/tasks/upgrade.yml | 7 |
3 files changed, 23 insertions, 14 deletions
diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml index 5d66451ee..dc1ecd626 100644 --- a/ansible/roles/keystone/tasks/bootstrap.yml +++ b/ansible/roles/keystone/tasks/bootstrap.yml @@ -37,18 +37,5 @@ run_once: True delegate_to: "{{ groups['keystone'][0] }}" -- name: Running Keystone bootstrap container - kolla_docker: - action: "start_container" - common_options: "{{ docker_common_options }}" - detach: False - environment: - KOLLA_BOOTSTRAP: - KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" - image: "{{ keystone_image_full }}" - name: "bootstrap_keystone" - restart_policy: "never" - volumes: "{{ node_config_directory }}/keystone/:{{ container_config_directory }}/:ro" - run_once: True - delegate_to: "{{ groups['keystone'][0] }}" +- include: bootstrap_service.yml when: database_created diff --git a/ansible/roles/keystone/tasks/bootstrap_service.yml b/ansible/roles/keystone/tasks/bootstrap_service.yml new file mode 100644 index 000000000..6b8ad2bfa --- /dev/null +++ b/ansible/roles/keystone/tasks/bootstrap_service.yml @@ -0,0 +1,15 @@ +--- +- name: Running Keystone bootstrap container + kolla_docker: + action: "start_container" + common_options: "{{ docker_common_options }}" + detach: False + environment: + KOLLA_BOOTSTRAP: + KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" + image: "{{ keystone_image_full }}" + name: "bootstrap_keystone" + restart_policy: "never" + volumes: "{{ node_config_directory }}/keystone/:{{ container_config_directory }}/:ro" + run_once: True + delegate_to: "{{ groups['keystone'][0] }}" diff --git a/ansible/roles/keystone/tasks/upgrade.yml b/ansible/roles/keystone/tasks/upgrade.yml new file mode 100644 index 000000000..c0e3b19a4 --- /dev/null +++ b/ansible/roles/keystone/tasks/upgrade.yml @@ -0,0 +1,7 @@ +--- +- include: config.yml + +- include: bootstrap_service.yml + +- include: start.yml + serial: "30%" |