Updating to use openshift.master.etcd_hosts for etcd servers for apiserver

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

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