Allow fast forward upgrade of custom roles

- adjust the templates to allow passing custom roles file when
  running fast forward upgrade operations
- instead of running Controller role only upgrade all roles
  except compute and ceph roles

Change-Id: I15ec672279af992af75e52b68e4c390816b56469
(cherry picked from commit 5a7e5aaab3)
This commit is contained in:
Marius Cornea 2018-06-22 15:26:10 -04:00
parent 9041619366
commit 724c4c7be1
4 changed files with 5 additions and 5 deletions

View File

@ -18,11 +18,11 @@
when: ffu_upgrade_workarounds|bool
tags: ffu_overcloud_upgrade_controller
- name: run FFU controller ugrade scripts
- name: run FFU control plane ugrade scripts
command: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh"
tags: ffu_overcloud_upgrade_controller
with_items:
- "{{ oc_roles|intersect(['Controller']) }}"
- "{{ oc_roles|difference(['Compute','ComputeAlt','CephStorage']) }}"
- include: "{{ item }}"
with_items:

View File

@ -32,6 +32,6 @@ openstack overcloud ceph-upgrade run \
--disable-validations \
--deployed-server \
{% endif %}
{% if not ffu_overcloud_upgrade %}--roles-file {{ roles_data }}{% endif %} 2>&1
{% if (not ffu_overcloud_upgrade or roles_data != default_roles_data) %}--roles-file {{ roles_data }}{% endif %} 2>&1
echo "[$(date)] Finished CEPH upgrade"

View File

@ -59,7 +59,7 @@ openstack overcloud {% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} upgra
-e {{working_dir}}/ceph-ansible-env.yaml \
{% endif %}
{% endif %}
{% if not ffu_overcloud_upgrade %}--roles-file {{ roles_data }}{% endif %} 2>&1
{% if (not ffu_overcloud_upgrade or roles_data != default_roles_data) %}--roles-file {{ roles_data }}{% endif %} 2>&1
echo "[$(date)] Finished {% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} major {% endif %}upgrade converge step"

View File

@ -44,4 +44,4 @@ openstack overcloud{% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} upgrad
-e {{ upgrade_prepare_extra_params | join(' -e ') }} \
{% endif %}
-e {{ working_dir }}/{{ container_registry_file }} \
{% if not ffu_overcloud_upgrade %}--roles-file {{ roles_data }}{% endif %} 2>&1
{% if (not ffu_overcloud_upgrade or roles_data != default_roles_data) %}--roles-file {{ roles_data }}{% endif %} 2>&1