diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-11-08 15:51:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-08 15:51:17 -0500 |
| commit | a7172e8482124feeccf07671fc8263a79fc281a0 (patch) | |
| tree | 1838759eba169d41807ec7ed2e0dd319269210ae /roles/openshift_master/tasks/main.yml | |
| parent | 52d2eb56e3198ed83c7c9a912aa22919e2180985 (diff) | |
| parent | 8757073d8509a6301b70ff66383d84416bdd78cb (diff) | |
| download | openshift-a7172e8482124feeccf07671fc8263a79fc281a0.tar.gz openshift-a7172e8482124feeccf07671fc8263a79fc281a0.tar.bz2 openshift-a7172e8482124feeccf07671fc8263a79fc281a0.tar.xz openshift-a7172e8482124feeccf07671fc8263a79fc281a0.zip | |
Merge pull request #6016 from kwoodson/bootstrap_enhancements-v3
Bootstrap enhancements.
Diffstat (limited to 'roles/openshift_master/tasks/main.yml')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 48b34c578..c7c02d49b 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -218,18 +218,7 @@ - restart master api - restart master controllers -- name: modify controller args - yedit: - src: /etc/origin/master/master-config.yaml - edits: - - key: kubernetesMasterConfig.controllerArguments.cluster-signing-cert-file - value: - - /etc/origin/master/ca.crt - - key: kubernetesMasterConfig.controllerArguments.cluster-signing-key-file - value: - - /etc/origin/master/ca.key - notify: - - restart master controllers +- include: bootstrap_settings.yml when: openshift_master_bootstrap_enabled | default(False) - include: set_loopback_context.yml |