diff options
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2')
3 files changed, 6 insertions, 16 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/containerized_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/containerized_upgrade.yml index 9cda5c9a4..3687beb36 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/containerized_upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/containerized_upgrade.yml @@ -1,6 +1,2 @@ - name: Update system_units script: ../files/ensure_system_units_have_version.sh {{ openshift.common.service_type }} {{ openshift.common.deployment_type }} {{ g_new_version }} - -- name: Ensure python-yaml present for config upgrade - action: "{{ ansible_pkg_mgr }} name=PyYAML state=present" - when: not openshift.common.is_atomic | bool diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml index a1d3ac5cc..64d8597a5 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml @@ -7,11 +7,6 @@ roles: - openshift_facts -- name: Load openshift_facts - hosts: oo_masters_to_config:oo_nodes_to_config:oo_etcd_to_config:oo_lb_to_config - roles: - - openshift_facts - - name: Evaluate additional groups for upgrade hosts: localhost connection: local @@ -35,9 +30,9 @@ tasks: - fail: msg: > - This upgrade is only supported for origin, openshift-enterprise, and online + This upgrade is only supported for atomic-enterprise, origin, openshift-enterprise, and online deployment types - when: deployment_type not in ['origin','openshift-enterprise', 'online'] + when: deployment_type not in ['atomic-enterprise', 'origin','openshift-enterprise', 'online'] - fail: msg: > diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml index 3ef9a207a..9e6696eb2 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml @@ -11,8 +11,6 @@ ############################################################################### - name: Upgrade master container hosts: oo_masters_to_config - roles: - - openshift_cli tasks: - include: rpm_upgrade.yml component=master when: not openshift.common.is_containerized | bool @@ -56,8 +54,6 @@ ############################################################################### - name: Upgrade nodes hosts: oo_nodes_to_config - roles: - - openshift_facts tasks: - include: rpm_upgrade.yml vars: @@ -68,7 +64,8 @@ - include: containerized_upgrade.yml when: openshift.common.is_containerized | bool - - name: Restart node service + # This will restart the node + - name: Restart openvswitch service service: name="{{ openshift.common.service_type }}-node" state=restarted - set_fact: @@ -97,6 +94,8 @@ ############################################################################### - name: Reconcile Cluster Roles and Cluster Role Bindings and Security Context Constraints hosts: oo_masters_to_config + roles: + - { role: openshift_cli, image_tag: "v{{ g_new_version }}" } vars: origin_reconcile_bindings: "{{ deployment_type == 'origin' and g_new_version | version_compare('1.0.6', '>') }}" ent_reconcile_bindings: true |