diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-06-30 14:40:56 -0500 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-06-30 14:40:56 -0500 |
| commit | afdf701f9ecdb46fe513f003d03d67cf484253d3 (patch) | |
| tree | 4bb05650c774c7df536a40d706166c83e4162544 | |
| parent | 7277203b1d5962d83c98d1b5f43c77312bcf9d6f (diff) | |
| download | openshift-afdf701f9ecdb46fe513f003d03d67cf484253d3.tar.gz openshift-afdf701f9ecdb46fe513f003d03d67cf484253d3.tar.bz2 openshift-afdf701f9ecdb46fe513f003d03d67cf484253d3.tar.xz openshift-afdf701f9ecdb46fe513f003d03d67cf484253d3.zip | |
Using ca-bundle.crt to connect to local etcd if master.etcd-ca.crt DNE
| -rw-r--r-- | roles/openshift_service_catalog/tasks/install.yml | 7 | ||||
| -rw-r--r-- | roles/openshift_service_catalog/templates/api_server.j2 | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/roles/openshift_service_catalog/tasks/install.yml b/roles/openshift_service_catalog/tasks/install.yml index 5da87649c..6e8301ffe 100644 --- a/roles/openshift_service_catalog/tasks/install.yml +++ b/roles/openshift_service_catalog/tasks/install.yml @@ -86,6 +86,12 @@ resource_name: admin user: "system:serviceaccount:kube-service-catalog:default" +- name: Checking for master.etcd-ca.crt + stat: + path: /etc/origin/master/master.etcd-ca.crt + register: etcd_ca_crt + check_mode: no + ## api server - template: src: api_server.j2 @@ -99,6 +105,7 @@ memory_request: none cors_allowed_origin: localhost etcd_servers: "{{ openshift.master.etcd_urls | join(',') }}" + etcd_cafile: "{{ '/etc/origin/master/master.etcd-ca.crt' if etcd_ca_crt.stat.exists else '/etc/origin/master/ca-bundle.crt' }}" node_selector: "{{ openshift_service_catalog_nodeselector | default ({'openshift-infra': 'apiserver'}) }}" - name: Set Service Catalog API Server daemonset diff --git a/roles/openshift_service_catalog/templates/api_server.j2 b/roles/openshift_service_catalog/templates/api_server.j2 index 0ae2b7712..c09834fd4 100644 --- a/roles/openshift_service_catalog/templates/api_server.j2 +++ b/roles/openshift_service_catalog/templates/api_server.j2 @@ -31,7 +31,7 @@ spec: - --etcd-servers - {{ etcd_servers }} - --etcd-cafile - - /etc/origin/master/master.etcd-ca.crt + - {{ etcd_cafile }} - --etcd-certfile - /etc/origin/master/master.etcd-client.crt - --etcd-keyfile |