diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-12-05 14:11:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-05 14:11:33 -0500 |
| commit | 110fe9352d3d935d1c4c90b16275e14ab2bf2da5 (patch) | |
| tree | f3b7e6968e83bfb3c24d981bb482e5c346410aac /playbooks/common | |
| parent | 3041cb8a4df8914f5f006f390ebb4cdb3feff47a (diff) | |
| parent | 4681da7ad9aafbc72adc45693655fc48543938b0 (diff) | |
| download | openshift-110fe9352d3d935d1c4c90b16275e14ab2bf2da5.tar.gz openshift-110fe9352d3d935d1c4c90b16275e14ab2bf2da5.tar.bz2 openshift-110fe9352d3d935d1c4c90b16275e14ab2bf2da5.tar.xz openshift-110fe9352d3d935d1c4c90b16275e14ab2bf2da5.zip | |
Merge pull request #2914 from abutcher/upgrade-admission-check
Conditionalize master config update for admission_plugin_config.
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_3/master_config_upgrade.yml | 1 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_4/master_config_upgrade.yml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_3/master_config_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_3/master_config_upgrade.yml index 8c0bd272c..68c71a132 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_3/master_config_upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_3/master_config_upgrade.yml @@ -53,6 +53,7 @@ dest: "{{ openshift.common.config_base}}/master/master-config.yaml" yaml_key: 'admissionConfig.pluginConfig' yaml_value: "{{ openshift.master.admission_plugin_config }}" + when: "{{ 'admission_plugin_config' in openshift.master }}" - modify_yaml: dest: "{{ openshift.common.config_base}}/master/master-config.yaml" diff --git a/playbooks/common/openshift-cluster/upgrades/v3_4/master_config_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_4/master_config_upgrade.yml index 32de9d94a..43c2ffcd4 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_4/master_config_upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_4/master_config_upgrade.yml @@ -3,6 +3,7 @@ dest: "{{ openshift.common.config_base}}/master/master-config.yaml" yaml_key: 'admissionConfig.pluginConfig' yaml_value: "{{ openshift.master.admission_plugin_config }}" + when: "{{ 'admission_plugin_config' in openshift.master }}" - modify_yaml: dest: "{{ openshift.common.config_base}}/master/master-config.yaml" |