Merge branch 'master' into coreos-fixes

roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2

@@ -48,5 +48,5 @@ spec:
       path: {{ kube_config_dir }}
     name: kubernetes-config
   - hostPath:
-      path: /usr/share/ca-certificates
+      path: /etc/ssl/certs/
     name: ssl-certs-host

roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2

@@ -16,6 +16,10 @@ spec:
     - --service-account-private-key-file={{ kube_cert_dir }}/apiserver-key.pem
     - --root-ca-file={{ kube_cert_dir }}/ca.pem
     - --v={{ kube_log_level | default('2') }}
+{% if cloud_provider is defined and cloud_provider == "openstack" %}
+    - --cloud-provider=openstack
+    - --cloud-config={{ kube_config_dir }}/cloud_config
+{% endif %}
     livenessProbe:
       httpGet:
         host: 127.0.0.1
@@ -30,10 +34,20 @@ spec:
     - mountPath: /etc/ssl/certs
       name: ssl-certs-host
       readOnly: true
+{% if cloud_provider is defined and cloud_provider == "openstack" %}
+    - mountPath: {{ kube_config_dir }}/cloud_config
+      name: cloudconfig
+      readOnly: true
+{% endif %}
   volumes:
   - hostPath:
       path: {{ kube_cert_dir }}
     name: ssl-certs-kubernetes
   - hostPath:
-      path: /usr/share/ca-certificates
+      path: /etc/ssl/certs/
     name: ssl-certs-host
+{% if cloud_provider is defined and cloud_provider == "openstack" %}
+  - hostPath:
+      path: {{ kube_config_dir }}/cloud_config
+    name: cloudconfig
+{% endif %}

roles/kubernetes/secrets/templates/openssl.conf.j2

@@ -9,9 +9,10 @@ subjectAltName = @alt_names
 [alt_names]
 DNS.1 = kubernetes
 DNS.2 = kubernetes.default
-DNS.3 = kubernetes.default.svc.{{ dns_domain }}
+DNS.3 = kubernetes.default.svc
+DNS.4 = kubernetes.default.svc.{{ dns_domain }}
 {% if loadbalancer_apiserver is defined  and apiserver_loadbalancer_domain_name is defined %}
-DNS.4 = {{ apiserver_loadbalancer_domain_name }}
+DNS.5 = {{ apiserver_loadbalancer_domain_name }}
 {% endif %}
 {% for host in groups['kube-master'] %}
 IP.{{ 2 * loop.index - 1 }} = {{ hostvars[host]['access_ip'] | default(hostvars[host]['ansible_default_ipv4']['address']) }}