Merge "Switching Horizon over to work via Kubernetes network"

etc/kolla-kubernetes/kolla-kubernetes.yml

@@ -15,3 +15,4 @@
 keystone_replicas: "1"
 memcached_replicas: "1"
 rabbitmq_replicas: "1"
+horizon_replicas: "1"

kolla_kubernetes/service_definition.py

@@ -38,7 +38,8 @@ POD_DEFINITIONS = {'mariadb': ['mariadb'],
                    'neutron': ['neutron-compute', 'neutron-control',
                                'neutron-network'],
                    'swift': ['swift-account', 'swift-container',
-                             'swift-object', 'swift-proxy']}
+                             'swift-object', 'swift-proxy'],
+                   'horizon': ['horizon']}
 
 # TODO(rhallisey): make container definitions dynamic
 # The containers in a pod
@@ -74,7 +75,8 @@ CONTAINER_DEFINITIONS = {'mariadb': ['mariadb'],
                                           'swift-object-replicator',
                                           'swift-object-updater',
                                           'swift-object-expirer'],
-                         'swift-proxy': ['swift-proxy-server']}
+                         'swift-proxy': ['swift-proxy-server'],
+                         'horizon': ['horizon']}
 
 
 def get_service_dict():

services/horizon/horizon-pod.yml.j2

@@ -1,7 +1,14 @@
 apiVersion: v1
-kind: Pod
+kind: ReplicationController
 spec:
-  hostNetwork: True
+  replicas: {{ horizon_replicas }}
+  selector:
+      service: horizon
+  template:
+    metadata:
+      labels:
+        service: horizon
+    spec:
       containers:
         - name: horizon
           image: "{{ horizon_image_full }}"
@@ -11,9 +18,14 @@ spec:
           env:
             - name: KOLLA_CONFIG_STRATEGY
               value: {{ config_strategy }}
+          ports:
+            - containerPort: 80
+              name: http
+            - containerPort: 443
+              name: https
       volumes:
-    - name: horizon-config
+        - name: horizon-configmap
           configMap:
-        name: horizon-config
+            name: horizon-configmap
 metadata:
    name: horizon

services/horizon/horizon-service.yml.j2

@@ -7,6 +7,6 @@ spec:
     - name: https
       port: 443
   selector:
-    name: horizon
+    service: horizon
 metadata:
    name: horizon