Merge "Introducing DaemonSet for Neutron Openvswitch components"

2016-08-10 21:33:23 +00:00 · 2016-08-10 21:33:23 +00:00 · 87431c16c9
parent cbab284b31 b2603094da
commit 87431c16c9
1 changed files with 158 additions and 130 deletions
--- a/services/neutron/neutron-compute-pod.yml.j2
+++ b/services/neutron/neutron-compute-pod.yml.j2
@ -1,131 +1,159 @@
-apiVersion: v1
-kind: Pod
-spec:
-  hostNetwork: True
-  containers:
-    - image: "{{ openvswitch_db_image_full }}"
-      name: openvswitch-db-server
-      volumeMounts:
-        - mountPath: {{ container_config_directory }}
-          name: openvswitch-db-config
-          readOnly: true
-        - mountPath: /var/lib/openvswitch
-          name: openvswitch-db
-        - mountPath: /run
-          name: host-run
-        - mountPath: /etc/localtime
-          name: host-etc-localtime
-          readOnly: true
-      env:
-        - name: KOLLA_CONFIG_STRATEGY
-          value: {{ config_strategy }}
-    - image: "{{ openvswitch_vswitchd_image_full }}"
-      name: openvswitch-vswitchd
-      securityContext:
-        privileged: true
-      volumeMounts:
-        - mountPath: {{ container_config_directory }}
-          name: openvswitch-vswitchd-config
-          readOnly: true
-        - mountPath: /run
-          name: host-run
-        - mountPath: /etc/localtime
-          name: host-etc-localtime
-          readOnly: true
-        - mountPath: /lib/modules
-          name: host-lib-modules
-          readOnly: true
-      env:
-        - name: KOLLA_CONFIG_STRATEGY
-          value: {{ config_strategy }}
-    # TODO: create containers for fake nova-compute.
-    - image: "{{ neutron_openvswitch_agent_image_full }}"
-      name: neutron-openvswitch-agent
-      securityContext:
-        privileged: true
-      volumeMounts:
-        - mountPath: {{ container_config_directory }}
-          name: neutron-openvswitch-agent-config
-          readOnly: true
-        - mountPath: /run
-          name: host-run
-        - mountPath: /etc/localtime
-          name: host-etc-localtime
-          readOnly: true
-        - mountPath: /lib/modules
-          name: host-lib-modules
-          readOnly: true
-        - mountPath: /var/log/kolla/
-          name: kolla-logs
-      env:
-        - name: KOLLA_CONFIG_STRATEGY
-          value: {{ config_strategy }}
-    - image: "{{ neutron_linuxbridge_agent_image_full }}"
-      name: neutron-linuxbridge-agent
-      securityContext:
-        privileged: true
-      volumeMounts:
-        - mountPath: {{ container_config_directory }}/neutron-linuxbridge-agent/
-          name: neutron-linuxbridge-agent-config
-          readOnly: true
-        - mountPath: /run
-          name: host-run
-        - mountPath: /etc/localtime
-          name: host-etc-localtime
-          readOnly: true
-        - mountPath: /lib/modules
-          name: host-lib-modules
-          readOnly: true
-        - mountPath: /var/log/kolla/
-          name: kolla-logs
-      env:
-        - name: KOLLA_CONFIG_STRATEGY
-          value: {{ config_strategy }}
-        - name: NEUTRON_BRIDGE
-          value: "br-ex"
-        - name: NEUTRON_INTERFACE
-          value: {{ neutron_external_interface }}
-
-  volumes:
-    - name: openvswitch-db-config
-      configMap:
-        name: openvswitch-db-server-configmap
-    - name: openvswitch-vswitchd-config
-      configMap:
-        name: openvswitch-vswitchd-configmap
-    - name: neutron-openvswitch-agent-config
-      configMap:
-        name: neutron-openvswitch-agent-configmap
-        items:
-        - key: neutron.conf
-          path: neutron.conf
-        - key: config.json
-          path: config.json
-        - key: ml2-conf.ini
-          path: ml2_conf.ini
-    - name: neutron-linuxbridge-agent-config
-      configMap:
-        name: neutron-linuxbridge-agent-configmap
-        items:
-        - key: neutron.conf
-          path: neutron.conf
-        - key: config.json
-          path: config.json
-        - key: ml2-conf.ini
-          path: ml2_conf.ini
-    - name: openvswitch-db
-      hostPath:
-        path: /var/lib/kolla/openvswitch
-    - name: host-run
-      hostPath:
-        path: /run
-    - name: host-etc-localtime
-      hostPath:
-        path: /etc/localtime
-    - name: host-lib-modules
-      hostPath:
-        path: /lib/modules
-    - name: kolla-logs
-      emptyDir: {}
+apiVersion: extensions/v1beta1
+kind: DaemonSet
 metadata:
-   name: neutron-compute
+  name: openvswitch-db
+  labels:
+    component: openvswitch
+    system: openvswitch-db
+  namespace: default
+spec:
+  template:
+    metadata:
+      name: openvswitch-db
+      labels:
+        component: openvswitch
+        system: openvswitch-db
+      namespace: default
+    spec:
+      hostNetwork: True
+      containers:
+        - image: "{{ openvswitch_db_image_full }}"
+          name: openvswitch-db-server
+          securityContext:
+            privileged: true
+          env:
+            - name: KOLLA_CONFIG_STRATEGY
+              value: {{ config_strategy }}
+          volumeMounts:
+            - mountPath: {{ container_config_directory }}
+              name: openvswitch-db-config
+              readOnly: true
+            - mountPath: /etc/openvswitch
+              name: openvswitch-db
+            - mountPath: /var/run/openvswitch
+              name: openvswitch-run
+            - mountPath: /run
+              name: host-run
+            - mountPath: /dev
+              name: host-dev
+            - mountPath: /etc/localtime
+              name: host-etc-localtime
+              readOnly: true
+
+        - image: "{{ openvswitch_vswitchd_image_full }}"
+          name: openvswitch-vswitchd
+          securityContext:
+            privileged: true
+          env:
+            - name: KOLLA_CONFIG_STRATEGY
+              value: {{ config_strategy }}
+          volumeMounts:
+            - mountPath: {{ container_config_directory }}
+              name: openvswitch-vswitchd-config
+              readOnly: true
+            - mountPath: /run
+              name: host-run
+            - mountPath: /dev
+              name: host-dev
+            - mountPath: /etc/localtime
+              name: host-etc-localtime
+              readOnly: true
+            - mountPath: /lib/modules
+              name: host-lib-modules
+              readOnly: true
+
+        - image: "{{ neutron_openvswitch_agent_image_full }}"
+          name: neutron-openvswitch-agent
+          securityContext:
+            privileged: true
+          env:
+            - name: KOLLA_CONFIG_STRATEGY
+              value: {{ config_strategy }}
+          volumeMounts:
+            - mountPath: {{ container_config_directory }}
+              name: neutron-openvswitch-agent-config
+              readOnly: true
+            - mountPath: /run
+              name: host-run
+            - mountPath: /dev
+              name: host-dev
+            - mountPath: /etc/localtime
+              name: host-etc-localtime
+              readOnly: true
+            - mountPath: /lib/modules
+              name: host-lib-modules
+              readOnly: true
+            - mountPath: /var/log/kolla/
+              name: kolla-logs
+
+# NOTE: (sbezverk) Linux bridge will be moved to its own file at the time of development
+# keeping it here just for future reference.
+#
+#    - image: "{{ neutron_linuxbridge_agent_image_full }}"
+#      name: neutron-linuxbridge-agent
+#      securityContext:
+#        privileged: true
+#      volumeMounts:
+#        - mountPath: {{ container_config_directory }}/neutron-linuxbridge-agent/
+#          name: neutron-linuxbridge-agent-config
+#          readOnly: true
+#        - mountPath: /run
+#          name: host-run
+#        - mountPath: /etc/localtime
+#          name: host-etc-localtime
+#          readOnly: true
+#        - mountPath: /lib/modules
+#          name: host-lib-modules
+#          readOnly: true
+#        - mountPath: /var/log/kolla/
+#          name: kolla-logs
+#      env:
+#        - name: KOLLA_CONFIG_STRATEGY
+#          value: {{ config_strategy }}
+#        - name: NEUTRON_BRIDGE
+#          value: "br-ex"
+#        - name: NEUTRON_INTERFACE
+#          value: {{ neutron_external_interface }}
+
+      volumes:
+        - name: openvswitch-vswitchd-config
+          configMap:
+            name: openvswitch-vswitchd-configmap
+        - name: openvswitch-db-config
+          configMap:
+            name: openvswitch-db-server-configmap
+        - name: neutron-openvswitch-agent-config
+          configMap:
+            name: neutron-openvswitch-agent-configmap
+            items:
+            - key: neutron.conf
+              path: neutron.conf
+            - key: config.json
+              path: config.json
+            - key: ml2-conf.ini
+              path: ml2_conf.ini
+# NOTE: (sbezverk) Linux bridge will be moved to its own file at the time of development
+# keeping it here just for future reference.
+#        - name: neutron-linuxbridge-agent-config
+#          configMap:
+#            name: neutron-linuxbridge-agent-configmap
+        - name: openvswitch-db
+          hostPath:
+            path: /etc/openvswitch
+        - name: openvswitch-run
+          hostPath:
+            path: /run/openvswitch
+        - name: host-run
+          hostPath:
+            path: /run
+        - name: host-dev
+          hostPath:
+            path: /dev
+        - name: host-etc-localtime
+          hostPath:
+            path: /etc/localtime
+        - name: host-lib-modules
+          hostPath:
+            path: /lib/modules
+        - name: kolla-logs
+          emptyDir: {}