summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-06-30 15:44:39 -0400
committerGitHub <noreply@github.com>2017-06-30 15:44:39 -0400
commita5e1e1fb2b068251c050722fd5f742dd3a92d93c (patch)
tree5d1dd1be5d9d6f951a448a17176aefb6b9f06de7
parenta4eccf0279529c2179afd72cf2b478e1ff51cf86 (diff)
parentafdf701f9ecdb46fe513f003d03d67cf484253d3 (diff)
downloadopenshift-a5e1e1fb2b068251c050722fd5f742dd3a92d93c.tar.gz
openshift-a5e1e1fb2b068251c050722fd5f742dd3a92d93c.tar.bz2
openshift-a5e1e1fb2b068251c050722fd5f742dd3a92d93c.tar.xz
openshift-a5e1e1fb2b068251c050722fd5f742dd3a92d93c.zip
Merge pull request #4660 from ewolinetz/bz1466233
Updating to use openshift.master.etcd_hosts for etcd servers for apis…
-rw-r--r--roles/openshift_service_catalog/tasks/install.yml8
-rw-r--r--roles/openshift_service_catalog/templates/api_server.j25
2 files changed, 10 insertions, 3 deletions
diff --git a/roles/openshift_service_catalog/tasks/install.yml b/roles/openshift_service_catalog/tasks/install.yml
index c1773b5f6..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
@@ -98,6 +104,8 @@
cpu_requests: none
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 8ae6b6c8d..c09834fd4 100644
--- a/roles/openshift_service_catalog/templates/api_server.j2
+++ b/roles/openshift_service_catalog/templates/api_server.j2
@@ -29,10 +29,9 @@ spec:
- --secure-port
- "6443"
- --etcd-servers
-# TODO: come back and get openshift.common.hostname to work
- - https://{{ openshift.common.ip }}:{{ openshift.master.etcd_port }}
+ - {{ etcd_servers }}
- --etcd-cafile
- - /etc/origin/master/master.etcd-ca.crt
+ - {{ etcd_cafile }}
- --etcd-certfile
- /etc/origin/master/master.etcd-client.crt
- --etcd-keyfile