diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-28 09:42:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-28 09:42:05 -0500 |
| commit | 68d883dd99c118c0374042f9d7ac5573aef0de7e (patch) | |
| tree | b1e1c498d98cc15eaffabe63811da9691d5ae7e8 /playbooks/common | |
| parent | 90fb07f40aa3945e71d3941bca54867c649bc95f (diff) | |
| parent | efecf62dc56a621e21962f66553d5ad3872286e5 (diff) | |
| download | openshift-68d883dd99c118c0374042f9d7ac5573aef0de7e.tar.gz openshift-68d883dd99c118c0374042f9d7ac5573aef0de7e.tar.bz2 openshift-68d883dd99c118c0374042f9d7ac5573aef0de7e.tar.xz openshift-68d883dd99c118c0374042f9d7ac5573aef0de7e.zip | |
Merge pull request #2836 from abutcher/BZ1393645
Merge admission plugin configs
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_3/master_config_upgrade.yml | 15 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_4/master_config_upgrade.yml | 15 |
2 files changed, 30 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 684eea343..8c0bd272c 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 @@ -48,3 +48,18 @@ dest: "{{ openshift.common.config_base}}/master/master-config.yaml" yaml_key: 'controllerConfig.servicesServingCert.signer.keyFile' yaml_value: service-signer.key + +- modify_yaml: + dest: "{{ openshift.common.config_base}}/master/master-config.yaml" + yaml_key: 'admissionConfig.pluginConfig' + yaml_value: "{{ openshift.master.admission_plugin_config }}" + +- modify_yaml: + dest: "{{ openshift.common.config_base}}/master/master-config.yaml" + yaml_key: 'admissionConfig.pluginOrderOverride' + yaml_value: + +- modify_yaml: + dest: "{{ openshift.common.config_base}}/master/master-config.yaml" + yaml_key: 'kubernetesMasterConfig.admissionConfig' + yaml_value: 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 new file mode 100644 index 000000000..32de9d94a --- /dev/null +++ b/playbooks/common/openshift-cluster/upgrades/v3_4/master_config_upgrade.yml @@ -0,0 +1,15 @@ +--- +- modify_yaml: + dest: "{{ openshift.common.config_base}}/master/master-config.yaml" + yaml_key: 'admissionConfig.pluginConfig' + yaml_value: "{{ openshift.master.admission_plugin_config }}" + +- modify_yaml: + dest: "{{ openshift.common.config_base}}/master/master-config.yaml" + yaml_key: 'admissionConfig.pluginOrderOverride' + yaml_value: + +- modify_yaml: + dest: "{{ openshift.common.config_base}}/master/master-config.yaml" + yaml_key: 'kubernetesMasterConfig.admissionConfig' + yaml_value: |