diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-12-16 14:11:17 -0500 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-12-16 16:32:00 -0500 |
| commit | 5d731d068a8291d8b81c58f0e99ec3d6740eaf7b (patch) | |
| tree | 150fadb1652b9a8346c94bd9820d3d165daf3a80 | |
| parent | 002fdef1769baccdd6c90a4caa8c0028ec9559db (diff) | |
| download | openshift-5d731d068a8291d8b81c58f0e99ec3d6740eaf7b.tar.gz openshift-5d731d068a8291d8b81c58f0e99ec3d6740eaf7b.tar.bz2 openshift-5d731d068a8291d8b81c58f0e99ec3d6740eaf7b.tar.xz openshift-5d731d068a8291d8b81c58f0e99ec3d6740eaf7b.zip | |
Add master config hook for 3.4 upgrade and fix facts ordering for config hook run.
| -rw-r--r-- | playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml index 496b00697..d6115e7a5 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml @@ -89,6 +89,8 @@ - include: ../../../../common/openshift-cluster/upgrades/cleanup_unused_images.yml - include: ../../../../common/openshift-cluster/upgrades/upgrade_control_plane.yml + vars: + master_config_hook: "v3_4/master_config_upgrade.yml" - include: ../../../../common/openshift-cluster/upgrades/upgrade_nodes.yml diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index 474e6311e..6950b6166 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -51,6 +51,14 @@ - include: create_service_signer_cert.yml +# Set openshift_master_facts separately. In order to reconcile +# admission_config's, we currently must run openshift_master_facts and +# then run openshift_facts. +- name: Set OpenShift master facts + hosts: oo_masters_to_config + roles: + - openshift_master_facts + - name: Upgrade master config and systemd units hosts: oo_masters_to_config handlers: @@ -58,8 +66,9 @@ static: yes roles: - openshift_facts - - openshift_master_facts - tasks: + post_tasks: + - include_vars: ../../../../roles/openshift_master_facts/vars/main.yml + - include: upgrade_scheduler.yml - include: "{{ master_config_hook }}" |