rolling-update: do not set group name vars at playbook level

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
pull/1349/head
Andrew Schoen 2017-03-07 13:16:12 -06:00
parent 4fe6607004
commit 46f26bec13
1 changed files with 8 additions and 17 deletions

View File

@ -34,17 +34,12 @@
- name: gather facts and check the init system - name: gather facts and check the init system
vars:
mon_group_name: mons
osd_group_name: osds
mds_group_name: mdss
rgw_group_name: rgws
hosts: hosts:
- "{{ mon_group_name }}" - "{{ mon_group_name|default('mons') }}"
- "{{ osd_group_name }}" - "{{ osd_group_name|default('osds') }}"
- "{{ mds_group_name }}" - "{{ mds_group_name|default('mdss') }}"
- "{{ rgw_group_name }}" - "{{ rgw_group_name|default('rgws') }}"
become: True become: True
tasks: tasks:
@ -55,13 +50,12 @@
- name: upgrade ceph mon cluster - name: upgrade ceph mon cluster
vars: vars:
mon_group_name: mons
health_mon_check_retries: 5 health_mon_check_retries: 5
health_mon_check_delay: 10 health_mon_check_delay: 10
upgrade_ceph_packages: True upgrade_ceph_packages: True
hosts: hosts:
- "{{ mon_group_name }}" - "{{ mon_group_name|default('mons') }}"
serial: 1 serial: 1
become: True become: True
@ -170,13 +164,12 @@
- name: upgrade ceph osds cluster - name: upgrade ceph osds cluster
vars: vars:
osd_group_name: osds
health_osd_check_retries: 40 health_osd_check_retries: 40
health_osd_check_delay: 30 health_osd_check_delay: 30
upgrade_ceph_packages: True upgrade_ceph_packages: True
hosts: hosts:
- "{{ osd_group_name }}" - "{{ osd_group_name|default('osds') }}"
serial: 1 serial: 1
become: True become: True
@ -314,11 +307,10 @@
- name: upgrade ceph mdss cluster - name: upgrade ceph mdss cluster
vars: vars:
mds_group_name: mdss
upgrade_ceph_packages: True upgrade_ceph_packages: True
hosts: hosts:
- "{{ mds_group_name }}" - "{{ mds_group_name|default('mdss') }}"
serial: 1 serial: 1
become: True become: True
@ -387,11 +379,10 @@
- name: upgrade ceph rgws cluster - name: upgrade ceph rgws cluster
vars: vars:
rgw_group_name: rgws
upgrade_ceph_packages: True upgrade_ceph_packages: True
hosts: hosts:
- "{{ rgw_group_name }}" - "{{ rgw_group_name|default('rgws') }}"
serial: 1 serial: 1
become: True become: True