diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-03 21:52:09 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-03 21:52:09 -0700 |
commit | 86643ad6e12d10803fdae5e103a7392795c35a8d (patch) | |
tree | 71562b1156b49e812c30f660cf140894267aec0a /roles/openshift_master/tasks/bootstrap_settings.yml | |
parent | 413fe019b488b75909629c68949ba693004afd6a (diff) | |
parent | 983fdade31c57654854cce3c5340e8bf5a7838e7 (diff) | |
download | openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.tar.gz openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.tar.bz2 openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.tar.xz openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.zip |
Merge pull request #6006 from mgugino-upstream-stage/elb-v2
Automatic merge from submit-queue.
Bootstrap enhancements.
This includes the elb work.
Diffstat (limited to 'roles/openshift_master/tasks/bootstrap_settings.yml')
-rw-r--r-- | roles/openshift_master/tasks/bootstrap_settings.yml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/roles/openshift_master/tasks/bootstrap_settings.yml b/roles/openshift_master/tasks/bootstrap_settings.yml new file mode 100644 index 000000000..cbd7f587b --- /dev/null +++ b/roles/openshift_master/tasks/bootstrap_settings.yml @@ -0,0 +1,14 @@ +--- +- 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 + when: openshift_master_bootstrap_enabled | default(False) |