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 /roles/openshift_master/defaults | |
| 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 'roles/openshift_master/defaults')
| -rw-r--r-- | roles/openshift_master/defaults/main.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml index 97a8735ee..3fb94fff8 100644 --- a/roles/openshift_master/defaults/main.yml +++ b/roles/openshift_master/defaults/main.yml @@ -67,3 +67,6 @@ openshift_master_bootstrap_enabled: False openshift_master_csr_sa: node-bootstrapper openshift_master_csr_namespace: openshift-infra + +openshift_master_config_file: "{{ openshift_master_config_dir }}/master-config.yaml" +openshift_master_scheduler_conf: "{{ openshift_master_config_dir }}/scheduler.json" |