diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2015-10-21 16:17:39 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2015-10-22 16:52:35 -0400 |
| commit | 7f5c403e144e6ef4d39bf7b11adb4c4a8976521c (patch) | |
| tree | be0917a61e45ccfb492895e59c06f0b36c39c574 /roles | |
| parent | ab959a27d43b1f3a1ef1bbc6eccdde24be1c89f0 (diff) | |
| download | openshift-7f5c403e144e6ef4d39bf7b11adb4c4a8976521c.tar.gz openshift-7f5c403e144e6ef4d39bf7b11adb4c4a8976521c.tar.bz2 openshift-7f5c403e144e6ef4d39bf7b11adb4c4a8976521c.tar.xz openshift-7f5c403e144e6ef4d39bf7b11adb4c4a8976521c.zip | |
Add proxy client certs to master config.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 3 | ||||
| -rw-r--r-- | roles/openshift_master_ca/tasks/main.yml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 6e45eaad7..72fdcf88d 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -74,6 +74,9 @@ kubernetesMasterConfig: masterCount: 1 masterIP: "" podEvictionTimeout: "" + proxyClientInfo: + certFile: master.proxy-client.crt + keyFile: master.proxy-client.key schedulerConfigFile: {{ openshift_master_scheduler_conf }} servicesNodePortRange: "" servicesSubnet: {{ openshift.master.portal_net }} diff --git a/roles/openshift_master_ca/tasks/main.yml b/roles/openshift_master_ca/tasks/main.yml index 5c9639ea5..cfd1ceabf 100644 --- a/roles/openshift_master_ca/tasks/main.yml +++ b/roles/openshift_master_ca/tasks/main.yml @@ -18,5 +18,4 @@ --master={{ openshift.master.api_url }} --public-master={{ openshift.master.public_api_url }} --cert-dir={{ openshift_master_config_dir }} --overwrite=false - args: - creates: "{{ openshift_master_config_dir }}/master.server.key" + when: master_certs_missing |