diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-04 08:48:20 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-04 08:48:20 -0400 |
| commit | 864abc6ee9e1d8265f6e5f755d803189bdc62802 (patch) | |
| tree | c0f0341c3035cbb318f1bda2a7401fca864031ab /playbooks/adhoc/upgrades/upgrade.yml | |
| parent | 8ca4308854c44649d2dcfd94f441790c2e5c5d2b (diff) | |
| parent | 74420660b1b12a00392a6d88a257e0cfe1b0a08e (diff) | |
| download | openshift-864abc6ee9e1d8265f6e5f755d803189bdc62802.tar.gz openshift-864abc6ee9e1d8265f6e5f755d803189bdc62802.tar.bz2 openshift-864abc6ee9e1d8265f6e5f755d803189bdc62802.tar.xz openshift-864abc6ee9e1d8265f6e5f755d803189bdc62802.zip | |
Merge branch 'config-upgrade' into upgrade
Diffstat (limited to 'playbooks/adhoc/upgrades/upgrade.yml')
| -rw-r--r-- | playbooks/adhoc/upgrades/upgrade.yml | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml index a959aa881..8c1138797 100644 --- a/playbooks/adhoc/upgrades/upgrade.yml +++ b/playbooks/adhoc/upgrades/upgrade.yml @@ -93,14 +93,14 @@ - fail: msg="Deployment type 'enterprise' must be updated to 'openshift-enterprise' for upgrade to proceed" when: deployment_type == "enterprise" and (_new_version.stdout | version_compare('1.0.7', '>=') or _new_version.stdout | version_compare('3.1', '>=')) -- name: Re-Run cluster configuration to apply latest configuration changes - include: ../../common/openshift-cluster/config.yml - vars: - g_etcd_group: "{{ 'etcd' }}" - g_masters_group: "{{ 'masters' }}" - g_nodes_group: "{{ 'nodes' }}" - openshift_cluster_id: "{{ cluster_id | default('default') }}" - openshift_deployment_type: "{{ deployment_type }}" + #- name: Re-Run cluster configuration to apply latest configuration changes + # include: ../../common/openshift-cluster/config.yml + # vars: + # g_etcd_group: "{{ 'etcd' }}" + # g_masters_group: "{{ 'masters' }}" + # g_nodes_group: "{{ 'nodes' }}" + # openshift_cluster_id: "{{ cluster_id | default('default') }}" + # openshift_deployment_type: "{{ deployment_type }}" - name: Upgrade masters hosts: masters @@ -111,6 +111,8 @@ yum: pkg=kernel state=latest - name: Upgrade master packages yum: pkg={{ openshift.common.service_type }}-master{{ openshift_version }} state=latest + - name: Upgrade master configuration. + openshift_upgrade_config: from_version=3.0 to_version=3.1 role=master - name: Restart master services service: name="{{ openshift.common.service_type}}-master" state=restarted @@ -118,6 +120,8 @@ hosts: nodes vars: openshift_version: "{{ openshift_pkg_version | default('') }}" + roles: + - openshift_facts tasks: - name: Upgrade node packages yum: pkg={{ openshift.common.service_type }}-node{{ openshift_version }} state=latest |