diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-04 16:01:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-04 16:01:29 +0000 |
| commit | 9fcd3122cdf4144901c4dff955707e93c0169130 (patch) | |
| tree | fc5022fbc4615c9c8bc3ed1432b659c3dbd5ceb3 | |
| parent | e72c8f11472ce30adf02d0c39d6de144ac9b4fc7 (diff) | |
| parent | 1a50a8162c11e4f1d125336f59d5f2fb859d8db7 (diff) | |
| download | kolla-9fcd3122cdf4144901c4dff955707e93c0169130.tar.gz kolla-9fcd3122cdf4144901c4dff955707e93c0169130.zip | |
Merge "Playbook for Ironic upgrade"
| -rw-r--r-- | ansible/roles/ironic/tasks/bootstrap.yml | 17 | ||||
| -rw-r--r-- | ansible/roles/ironic/tasks/bootstrap_service.yml | 16 | ||||
| -rw-r--r-- | ansible/roles/ironic/tasks/upgrade.yml | 6 |
3 files changed, 23 insertions, 16 deletions
diff --git a/ansible/roles/ironic/tasks/bootstrap.yml b/ansible/roles/ironic/tasks/bootstrap.yml index 7c774544f..4932af357 100644 --- a/ansible/roles/ironic/tasks/bootstrap.yml +++ b/ansible/roles/ironic/tasks/bootstrap.yml @@ -37,22 +37,7 @@ run_once: True delegate_to: "{{ groups['ironic-api'][0] }}" -- name: Running Ironic bootstrap container - kolla_docker: - action: "start_container" - common_options: "{{ docker_common_options }}" - detach: False - environment: - KOLLA_BOOTSTRAP: - KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" - image: "{{ ironic_api_image_full }}" - labels: - BOOTSTRAP: - name: "bootstrap_ironic" - restart_policy: "never" - volumes: "{{ node_config_directory }}/ironic-api/:{{ container_config_directory }}/:ro" - run_once: True - delegate_to: "{{ groups['ironic-api'][0] }}" +- include: bootstrap_service.yml when: database_created - name: Running Ironic-PXE bootstrap container diff --git a/ansible/roles/ironic/tasks/bootstrap_service.yml b/ansible/roles/ironic/tasks/bootstrap_service.yml new file mode 100644 index 000000000..115b27a0a --- /dev/null +++ b/ansible/roles/ironic/tasks/bootstrap_service.yml @@ -0,0 +1,16 @@ +- name: Running Ironic bootstrap container + kolla_docker: + action: "start_container" + common_options: "{{ docker_common_options }}" + detach: False + environment: + KOLLA_BOOTSTRAP: + KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" + image: "{{ ironic_api_image_full }}" + labels: + BOOTSTRAP: + name: "bootstrap_ironic" + restart_policy: "never" + volumes: "{{ node_config_directory }}/ironic-api/:{{ container_config_directory }}/:ro" + run_once: True + delegate_to: "{{ groups['ironic-api'][0] }}" diff --git a/ansible/roles/ironic/tasks/upgrade.yml b/ansible/roles/ironic/tasks/upgrade.yml index ed97d539c..c0e3b19a4 100644 --- a/ansible/roles/ironic/tasks/upgrade.yml +++ b/ansible/roles/ironic/tasks/upgrade.yml @@ -1 +1,7 @@ --- +- include: config.yml + +- include: bootstrap_service.yml + +- include: start.yml + serial: "30%" |