Merge "Glance works without host network"

bootstrap/glance/glance-job.yml.j2

@@ -8,13 +8,12 @@ spec:
       name: glance-bootstrap
     spec:
       restartPolicy: OnFailure
-      hostNetwork: True
       containers:
         - image: "{{ kolla_toolbox_image_full }}"
           name: creating-glance-database
           #TODO: Assign the IP to be mariadb's serivce ip exposed by Kubernetes
           command: ["usr/bin/ansible", "localhost", "-vvvv", "-m", "mysql_db",
-                    "-a", "login_host='{{ kolla_internal_vip_address }}'
+                    "-a", "login_host='mariadb'
                     login_user='{{ database_user }}'
                     login_password='{{ database_password }}'
                     name='{{ glance_database_name }}'"]
@@ -35,7 +34,7 @@ spec:
           name: creating-glance-user-and-permissions
           #TODO: Assign the IP to be mariadb's serivce ip exposed by Kubernetes
           command: ["/usr/bin/ansible", "localhost", "-vvvv", "-m", "mysql_user",
-                     "-a", "login_host='{{ kolla_internal_vip_address }}'
+                     "-a", "login_host='mariadb'
                      login_user='{{ database_user }}'
                      login_password='{{ database_password }}'
                      name='{{ glance_database_name }}'

etc/kolla-kubernetes/kolla-kubernetes.yml

@@ -16,3 +16,5 @@ keystone_replicas: "1"
 memcached_replicas: "1"
 rabbitmq_replicas: "1"
 horizon_replicas: "1"
+glance_api_replicas: "1"
+glance_registry_replicas: "1"

services/glance/glance-api-pod.yml.j2

@@ -0,0 +1,45 @@
+apiVersion: v1
+kind: ReplicationController
+spec:
+  replicas: {{ glance_api_replicas }}
+  selector:
+      service: glance
+      type: api
+  template:
+    metadata:
+      labels:
+        service: glance
+        type: api
+    spec:
+      containers:
+        - name: glance-api
+          image: "{{ glance_api_image_full }}"
+          volumeMounts:
+            - mountPath: {{ container_config_directory }}
+              name: glance-config
+            - mountPath: /var/lib/glance/
+              name: glance-persistent-storage
+            - mountPath: /var/log/kolla/
+              name: kolla-logs
+            - mountPath: /etc/localtime
+              name: etc-localtime
+          env:
+            - name: KOLLA_CONFIG_STRATEGY
+              value: {{ config_strategy }}
+          ports:
+            - containerPort: {{ glance_api_port }}
+              name: glance-api
+      volumes:
+        - name: glance-config
+          configMap:
+            name: glance-api-configmap
+        - name: glance-persistent-storage
+          hostPath:
+            path: /var/lib/kolla/glance
+        - name: etc-localtime
+          hostPath:
+            path: /etc/localtime
+        - name: kolla-logs
+          emptyDir: {}
+metadata:
+   name: glance-api

services/glance/glance-api-service.yml.j2

@@ -3,7 +3,9 @@ kind: Service
 spec:
   ports:
     - port: {{ glance_api_port }}
+      name: glance-api
   selector:
-    name: glance-api
+    service: glance
+    type: api
 metadata:
    name: glance-api

services/glance/glance-pod.yml.j2

@@ -1,46 +0,0 @@
-apiVersion: v1
-kind: Pod
-spec:
-  hostNetwork: True
-  containers:
-    - name: glance-api
-      image: "{{ glance_api_image_full }}"
-      volumeMounts:
-        - mountPath: {{ container_config_directory }}
-          name: glance-api-config
-        - mountPath: /var/lib/glance/
-          name: glance-persistent-storage
-        - mountPath: /var/log/kolla/
-          name: kolla-logs
-        - mountPath: /etc/localtime
-          name: etc-localtime
-      env:
-        - name: KOLLA_CONFIG_STRATEGY
-          value: {{ config_strategy }}
-    - name: glance-registry
-      image: "{{ glance_registry_image_full }}"
-      volumeMounts:
-        - mountPath: {{ container_config_directory }}
-          name: glance-registry-config
-        - mountPath: /var/log/kolla/
-          name: kolla-logs
-      env:
-        - name: KOLLA_CONFIG_STRATEGY
-          value: {{ config_strategy }}
-  volumes:
-    - name: glance-api-config
-      configMap:
-        name: glance-api-configmap
-    - name: glance-registry-config
-      configMap:
-        name: glance-registry-configmap
-    - name: glance-persistent-storage
-      hostPath:
-        path: /var/lib/kolla/glance
-    - name: etc-localtime
-      hostPath:
-        path: /etc/localtime
-    - name: kolla-logs
-      emptyDir: {}
-metadata:
-   name: glance

services/glance/glance-registry-pod.yml.j2

@@ -0,0 +1,35 @@
+apiVersion: v1
+kind: ReplicationController
+spec:
+  replicas: {{ glance_registry_replicas }}
+  selector:
+      service: glance
+      type: registry
+  template:
+    metadata:
+      labels:
+        service: glance
+        type: registry
+    spec:
+      containers:
+        - name: glance-registry
+          image: "{{ glance_registry_image_full }}"
+          volumeMounts:
+            - mountPath: {{ container_config_directory }}
+              name: glance-config
+            - mountPath: /var/log/kolla/
+              name: kolla-logs
+          env:
+            - name: KOLLA_CONFIG_STRATEGY
+              value: {{ config_strategy }}
+          ports:
+            - containerPort: {{ glance_registry_port }}
+              name: glance-registry
+      volumes:
+        - name: glance-config
+          configMap:
+            name: glance-registry-configmap
+        - name: kolla-logs
+          emptyDir: {}
+metadata:
+   name: glance-registry

services/glance/glance-registry-service.yml.j2

@@ -3,7 +3,9 @@ kind: Service
 spec:
   ports:
     - port: {{ glance_registry_port }}
+      name: glance-registry
   selector:
-    name: glance-registry
+    service: glance
+    type: registry
 metadata:
    name: glance-registry