diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-04 17:58:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-04 17:58:29 +0000 |
| commit | e9eb2f44caf2b1cfc48bc8d293164c06871ba6ee (patch) | |
| tree | 95abbb9ccf94d10b4ef057ae65ab5f153dbd0aef | |
| parent | 92d5b3e5e06a1699621f766f3e214fb796dcc5c3 (diff) | |
| parent | 4d0a3328f3b89757d785609d888b41152efe8179 (diff) | |
| download | kolla-e9eb2f44caf2b1cfc48bc8d293164c06871ba6ee.tar.gz kolla-e9eb2f44caf2b1cfc48bc8d293164c06871ba6ee.zip | |
Merge "Playbook for Manila upgrade"
| -rw-r--r-- | ansible/roles/manila/tasks/bootstrap.yml | 18 | ||||
| -rw-r--r-- | ansible/roles/manila/tasks/bootstrap_service.yml | 19 | ||||
| -rw-r--r-- | ansible/roles/manila/tasks/upgrade.yml | 6 |
3 files changed, 26 insertions, 17 deletions
diff --git a/ansible/roles/manila/tasks/bootstrap.yml b/ansible/roles/manila/tasks/bootstrap.yml index ee76ac18d..31b8600e4 100644 --- a/ansible/roles/manila/tasks/bootstrap.yml +++ b/ansible/roles/manila/tasks/bootstrap.yml @@ -35,21 +35,5 @@ run_once: True delegate_to: "{{ groups['manila-api'][0] }}" -- name: Running Manila bootstrap container - kolla_docker: - action: "start_container" - common_options: "{{ docker_common_options }}" - detach: False - environment: - KOLLA_BOOTSTRAP: - KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" - image: "{{ manila_api_image_full }}" - labels: - BOOTSTRAP: - name: "bootstrap_manila" - restart_policy: "never" - volumes: - - "{{ node_config_directory }}/manila-api/:{{ container_config_directory }}/:ro" - run_once: True - delegate_to: "{{ groups['manila-api'][0] }}" +- include: bootstrap_service.yml when: database_created diff --git a/ansible/roles/manila/tasks/bootstrap_service.yml b/ansible/roles/manila/tasks/bootstrap_service.yml new file mode 100644 index 000000000..05e54ad16 --- /dev/null +++ b/ansible/roles/manila/tasks/bootstrap_service.yml @@ -0,0 +1,19 @@ +--- +- name: Running Manila bootstrap container + kolla_docker: + action: "start_container" + common_options: "{{ docker_common_options }}" + detach: False + environment: + KOLLA_BOOTSTRAP: + KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" + image: "{{ manila_api_image_full }}" + labels: + BOOTSTRAP: + name: "bootstrap_manila" + restart_policy: "never" + volumes: + - "{{ node_config_directory }}/manila-api/:{{ container_config_directory }}/:ro" + - "kolla_logs:/var/log/kolla/" + run_once: True + delegate_to: "{{ groups['manila-api'][0] }}" diff --git a/ansible/roles/manila/tasks/upgrade.yml b/ansible/roles/manila/tasks/upgrade.yml index ed97d539c..c0e3b19a4 100644 --- a/ansible/roles/manila/tasks/upgrade.yml +++ b/ansible/roles/manila/tasks/upgrade.yml @@ -1 +1,7 @@ --- +- include: config.yml + +- include: bootstrap_service.yml + +- include: start.yml + serial: "30%" |