diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-15 13:32:04 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-15 13:32:04 -0800 |
commit | acdd5e905be2605138143a970899672634492ecf (patch) | |
tree | a6b9fb03b8fe2c7e6acd98f16cf4602888607d1d /playbooks/common/openshift-cluster/upgrades/v3_7 | |
parent | 763f604fccb71971cd6fda3ae63312233bbe1d4e (diff) | |
parent | 4877e1c21a26d2aba314e6272478005d12b7f14b (diff) | |
download | openshift-acdd5e905be2605138143a970899672634492ecf.tar.gz openshift-acdd5e905be2605138143a970899672634492ecf.tar.bz2 openshift-acdd5e905be2605138143a970899672634492ecf.tar.xz openshift-acdd5e905be2605138143a970899672634492ecf.zip |
Merge pull request #6084 from mgugino-upstream-stage/combine-master-upgrade
Automatic merge from submit-queue.
Combine master upgrade play with role
Currently, there are plays importing tasks directly from
openshift_master role. This has caused numerous bugs
and code duplicaiton in the past.
This commit combines the upgrade into openshift_master role
utilizing include_role syntax.
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/v3_7')
-rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_7/master_config_upgrade.yml | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/master_config_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/master_config_upgrade.yml deleted file mode 100644 index 1d4d1919c..000000000 --- a/playbooks/common/openshift-cluster/upgrades/v3_7/master_config_upgrade.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- modify_yaml: - dest: "{{ openshift.common.config_base}}/master/master-config.yaml" - yaml_key: 'controllerConfig.election.lockName' - yaml_value: 'openshift-master-controllers' - -- modify_yaml: - dest: "{{ openshift.common.config_base}}/master/master-config.yaml" - yaml_key: 'controllerConfig.serviceServingCert.signer.certFile' - yaml_value: service-signer.crt - -- modify_yaml: - dest: "{{ openshift.common.config_base}}/master/master-config.yaml" - yaml_key: 'controllerConfig.serviceServingCert.signer.keyFile' - yaml_value: service-signer.key - -- modify_yaml: - dest: "{{ openshift.common.config_base }}/master/master-config.yaml" - yaml_key: servingInfo.clientCA - yaml_value: ca.crt |