Adhere to ANSIBLE0011 All tasks should be named.
Change-Id: Idfe041fba9120964a5af06b3a25c55b87b611960
Closes-Bug: #1764454
(cherry picked from commit 2bead7f8be
)
This commit is contained in:
parent
1d0b662e19
commit
9e67560f90
@ -23,7 +23,8 @@
|
||||
with_items:
|
||||
- "{{ envs.stdout_lines }}"
|
||||
|
||||
- set_fact:
|
||||
- name: set ceph_env fact
|
||||
set_fact:
|
||||
ceph_env: "{{ item.item }}"
|
||||
when: "{{ item.stdout|length > 0 }}"
|
||||
with_items:
|
||||
@ -40,14 +41,17 @@
|
||||
command: "cat {{ ceph_env }}"
|
||||
register: ceph_puppet
|
||||
|
||||
- set_fact:
|
||||
- name: set ceph_osds fact
|
||||
set_fact:
|
||||
ceph_osds: "{{ (ceph_puppet.stdout | from_yaml).parameter_defaults.ExtraConfig['ceph::profile::params::osds'] | default([]) }}"
|
||||
|
||||
- set_fact:
|
||||
- name: set ceph_osds_pg fact
|
||||
set_fact:
|
||||
ceph_osds_pg: "{{ (ceph_puppet.stdout | from_yaml).parameter_defaults.ExtraConfig['ceph::profile::params::osd_pool_default_pg_num'] }}"
|
||||
ignore_errors: true
|
||||
|
||||
- set_fact:
|
||||
- name: set ceph_osds_non_collocated fact
|
||||
set_fact:
|
||||
ceph_osds_non_collocated: true
|
||||
when: "'journal' in ceph_puppet.stdout"
|
||||
|
||||
@ -56,10 +60,12 @@
|
||||
src: cephosd.yaml.j2
|
||||
dest: "{{working_dir}}/ceph-ansible-env.yaml"
|
||||
|
||||
- set_fact:
|
||||
- name: set extra_config fact
|
||||
set_fact:
|
||||
extra_config: "{{ (ceph_puppet.stdout | from_yaml).parameter_defaults.ExtraConfig }}"
|
||||
|
||||
- lineinfile:
|
||||
- name: remove unused ceph parameters.
|
||||
lineinfile:
|
||||
path: "{{ ceph_env }}"
|
||||
regexp: "{{ item }}"
|
||||
state: absent
|
||||
@ -68,12 +74,14 @@
|
||||
- "ceph::profile::params::osd_pool_default_pgp_num"
|
||||
- "ceph::profile::params::osds"
|
||||
|
||||
- lineinfile:
|
||||
- name: remove journal from ceph_env
|
||||
lineinfile:
|
||||
path: "{{ ceph_env }}"
|
||||
regexp: "journal"
|
||||
state: absent
|
||||
|
||||
- lineinfile:
|
||||
- name: remove ceph_osd from ceph env.
|
||||
lineinfile:
|
||||
path: "{{ ceph_env }}"
|
||||
regexp: "{{ item }}"
|
||||
state: absent
|
||||
@ -83,7 +91,8 @@
|
||||
command: "cat {{ ceph_env }}"
|
||||
register: ceph_puppet
|
||||
|
||||
- set_fact:
|
||||
- name: set extra_config from ceph puppet.
|
||||
set_fact:
|
||||
extra_config: "{{ (ceph_puppet.stdout | from_yaml).parameter_defaults.ExtraConfig }}"
|
||||
|
||||
- name: replace empty extraconfig
|
||||
|
@ -4,5 +4,6 @@
|
||||
openstack overcloud config download --name {{ overcloud_stack_name }}
|
||||
register: config_download
|
||||
|
||||
- set_fact:
|
||||
- name: set overcloud_config_dir fact.
|
||||
set_fact:
|
||||
overcloud_config_dir: "{{ config_download.stdout | regex_search('(/.*tripleo.*)')}}"
|
||||
|
@ -18,5 +18,6 @@
|
||||
openstack stack resource list --filter status=FAILED --nested-depth 5 {{ overcloud_stack_name }} | tee {{ working_dir}}/ffu_update_stack_outputs_failed_resources.log
|
||||
when: ffu_stack_output|failed
|
||||
|
||||
- fail: msg="FFU update stack outputs step failed... :("
|
||||
- name: was the ffu update stack outputs successful.
|
||||
fail: msg="FFU update stack outputs step failed... :("
|
||||
when: ffu_stack_output|failed
|
||||
|
@ -16,5 +16,6 @@
|
||||
source {{ undercloud_rc }}
|
||||
openstack stack resource list --filter status=FAILED --nested-depth 5 {{ overcloud_stack_name }} | tee {{ working_dir}}/ffu_upgrade_ceph_failed_resources.log
|
||||
|
||||
- fail: msg="FFU upgrade ceph step failed... :("
|
||||
- name: was the ffu update ceph successful.
|
||||
fail: msg="FFU upgrade ceph step failed... :("
|
||||
when: ffu_upgrade_ceph|failed
|
||||
|
@ -2,7 +2,8 @@
|
||||
command: "{{ working_dir }}/pre_undercloud_upgrade_{{ current_release }}_workarounds.sh"
|
||||
when: ffu_upgrade_workarounds
|
||||
|
||||
- include_role:
|
||||
- name: Include rhos-release role.
|
||||
include_role:
|
||||
name: rhos-release
|
||||
vars:
|
||||
director_build: "{{ install.get('director', {}).build|default(omit) }}"
|
||||
|
@ -17,6 +17,7 @@
|
||||
source {{ undercloud_rc }}
|
||||
openstack stack resource list --filter status=FAILED --nested-depth 5 {{ overcloud_stack_name }} | tee {{ working_dir}}/overcloud_failed_prepare_resources.log
|
||||
|
||||
- fail: msg="Overcloud minor update preparation step failed..."
|
||||
- name: was the overcloud update prepare successful.
|
||||
fail: msg="Overcloud minor update preparation step failed..."
|
||||
when: overcloud_update_prepare.rc != 0
|
||||
|
||||
|
@ -8,7 +8,8 @@
|
||||
register: overcloud_update_nodes
|
||||
ignore_errors: yes
|
||||
|
||||
- fail: msg="Overcloud minor update execution step failed..."
|
||||
- name: was the overcloud minor update successful.
|
||||
fail: msg="Overcloud minor update execution step failed..."
|
||||
with_items: "{{ overcloud_update_nodes.results }}"
|
||||
when: item.rc != 0
|
||||
|
||||
|
@ -12,7 +12,8 @@
|
||||
source {{ undercloud_rc }}
|
||||
openstack stack failures list --long {{ overcloud_stack_name }} | tee {{ working_dir}}/overcloud_composable_failed_converge.log
|
||||
|
||||
- fail: msg="Overcloud upgrade converge step failed... :("
|
||||
- name: was the overcloud upgrade converge successful.
|
||||
fail: msg="Overcloud upgrade converge step failed... :("
|
||||
when: overcloud_converge_upgrade.rc != 0
|
||||
|
||||
- include: ../common/l3_agent_connectivity_check_stop_script.yml
|
||||
|
@ -32,6 +32,7 @@
|
||||
source {{ undercloud_rc }}
|
||||
openstack stack resource list --filter status=FAILED --nested-depth 5 {{ overcloud_stack_name }} | tee {{ working_dir}}/overcloud_failed_prepare_resources.log
|
||||
|
||||
- fail: msg="Overcloud upgrade preparation step failed... :("
|
||||
- name: was the overcloud upgrade preparation successful.
|
||||
fail: msg="Overcloud upgrade preparation step failed... :("
|
||||
when: overcloud_upgrade_prepare.rc != 0
|
||||
|
||||
|
@ -8,7 +8,8 @@
|
||||
register: overcloud_upgrade_nodes
|
||||
ignore_errors: yes
|
||||
|
||||
- fail: msg="Overcloud upgrade composable step failed... :("
|
||||
- name: was the overcloud upgrade composable step successful.
|
||||
fail: msg="Overcloud upgrade composable step failed... :("
|
||||
with_items: "{{ overcloud_upgrade_nodes.results }}"
|
||||
when: item.rc != 0
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user