diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-06-30 12:17:12 -0500 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-06-30 12:17:12 -0500 |
| commit | 7277203b1d5962d83c98d1b5f43c77312bcf9d6f (patch) | |
| tree | 0b985508093beee3efeece4bb2e0c5e90156476c | |
| parent | ca089c724a7a44efa6abb88313a461f9f7cda122 (diff) | |
| download | openshift-7277203b1d5962d83c98d1b5f43c77312bcf9d6f.tar.gz openshift-7277203b1d5962d83c98d1b5f43c77312bcf9d6f.tar.bz2 openshift-7277203b1d5962d83c98d1b5f43c77312bcf9d6f.tar.xz openshift-7277203b1d5962d83c98d1b5f43c77312bcf9d6f.zip | |
Updating to use openshift.master.etcd_hosts for etcd servers for apiserver
| -rw-r--r-- | roles/openshift_service_catalog/tasks/install.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_service_catalog/templates/api_server.j2 | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_service_catalog/tasks/install.yml b/roles/openshift_service_catalog/tasks/install.yml index c1773b5f6..5da87649c 100644 --- a/roles/openshift_service_catalog/tasks/install.yml +++ b/roles/openshift_service_catalog/tasks/install.yml @@ -98,6 +98,7 @@ cpu_requests: none memory_request: none cors_allowed_origin: localhost + etcd_servers: "{{ openshift.master.etcd_urls | join(',') }}" 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..0ae2b7712 100644 --- a/roles/openshift_service_catalog/templates/api_server.j2 +++ b/roles/openshift_service_catalog/templates/api_server.j2 @@ -29,8 +29,7 @@ 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-certfile |