Mount /var/log and /etc/contrail dir to host

Through this commit we will host mount /var/log and /etc/contrail directories to host. Also have moved analyticsdb-nodemgr daemonset to contrail-thirdparty chart Change-Id: I6df552fb459d631a83441016afdabcba2ad5bddb Partial-Bug: #1749018
Juniper · Feb 13, 2018 · e3ba44f · e3ba44f
1 parent 325cea2
commit e3ba44f
Show file tree

Hide file tree

Showing 29 changed files with 254 additions and 52 deletions.
diff --git a/contrail-analytics/templates/daemonset-alarm-gen.yaml b/contrail-analytics/templates/daemonset-alarm-gen.yaml
@@ -42,8 +42,13 @@ spec:
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       volumes:
+      - name: etc-contrail
+        hostPath:
+          path: /etc/contrail/analytics/
       - name: contrail-log
         hostPath:
-          path: /var/log/contrail/
+          path: /var/log/contrail/analytics/
 {{- end }}
diff --git a/contrail-analytics/templates/daemonset-analytics-api.yaml b/contrail-analytics/templates/daemonset-analytics-api.yaml
@@ -40,8 +40,13 @@ spec:
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       volumes:
+      - name: etc-contrail
+        hostPath:
+          path: /etc/contrail/analytics/
       - name: contrail-log
         hostPath:
-          path: /var/log/contrail/
+          path: /var/log/contrail/analytics/
 {{- end }}
diff --git a/contrail-analytics/templates/daemonset-analytics-collector.yaml b/contrail-analytics/templates/daemonset-analytics-collector.yaml
@@ -42,8 +42,13 @@ spec:
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       volumes:
+      - name: etc-contrail
+        hostPath:
+          path: /etc/contrail/analytics/
       - name: contrail-log
         hostPath:
-          path: /var/log/contrail/
+          path: /var/log/contrail/analytics/
 {{- end }}
diff --git a/contrail-analytics/templates/daemonset-analytics-nodemgr.yaml b/contrail-analytics/templates/daemonset-analytics-nodemgr.yaml
@@ -52,11 +52,16 @@ spec:
           name: docker-unix-socket
         - mountPath: /var/log/contrail/
           name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       volumes:
       - name: docker-unix-socket
         hostPath:
           path: /var/run
+      - name: etc-contrail
+        hostPath:
+          path: /etc/contrail/analytics/
       - name: contrail-log
         hostPath:
-          path: /var/log/contrail/
+          path: /var/log/contrail/analytics/
 {{- end }}
diff --git a/contrail-analytics/templates/daemonset-analytics.yaml b/contrail-analytics/templates/daemonset-analytics.yaml
@@ -38,6 +38,11 @@ spec:
             name: configmap-analytics
         - configMapRef:
             name: configmap-analytics-auth
+        volumeMounts:
+        - mountPath: /var/log/contrail/
+          name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       - name: contrail-collector
         image: {{ .Values.images.tags.contrail_collector | quote }}
         imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
@@ -48,6 +53,11 @@ spec:
             name: configmap-analytics-auth
         - configMapRef:
             name: configmap-analytics-rabbitmq
+        volumeMounts:
+        - mountPath: /var/log/contrail/
+          name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       - name: contrail-alarm-gen
         image: {{ .Values.images.tags.analytics_alarm_gen | quote }}
         imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
@@ -58,6 +68,11 @@ spec:
             name: configmap-analytics-auth
         - configMapRef:
             name: configmap-analytics-rabbitmq
+        volumeMounts:
+        - mountPath: /var/log/contrail/
+          name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       - name: contrail-query-engine
         image: {{ .Values.images.tags.analytics_query_engine | quote }}
         imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
@@ -66,6 +81,11 @@ spec:
             name: configmap-analytics
         - configMapRef:
             name: configmap-analytics-auth
+        volumeMounts:
+        - mountPath: /var/log/contrail/
+          name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       - name: contrail-snmp-collector
         image: {{ .Values.images.tags.analytics_snmp_collector | quote }}
         imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
@@ -76,6 +96,11 @@ spec:
             name: configmap-analytics-auth
         - configMapRef:
             name: configmap-analytics-rabbitmq
+        volumeMounts:
+        - mountPath: /var/log/contrail/
+          name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       - name: contrail-topology
         image: {{ .Values.images.tags.contrail_topology | quote }}
         imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
@@ -86,6 +111,11 @@ spec:
             name: configmap-analytics-auth
         - configMapRef:
             name: configmap-analytics-rabbitmq
+        volumeMounts:
+        - mountPath: /var/log/contrail/
+          name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       - name: contrail-analytics-nodemgr
         image: {{ .Values.images.tags.nodemgr | quote }}
         imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
@@ -99,6 +129,11 @@ spec:
           value: analytics
         - name: DOCKER_HOST
           value: "unix://mnt/docker.sock"
+        volumeMounts:
+        - mountPath: /var/log/contrail/
+          name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
 # todo: there is type Socket in new kubernetes, it is possible to use full
 # path:
 # hostPath:
@@ -111,5 +146,12 @@ spec:
       - name: docker-unix-socket
         hostPath:
           path: /var/run
+      - name: etc-contrail
+        hostPath:
+          path: /etc/contrail/analytics/
+      - name: contrail-log
+        hostPath:
+          path: /var/log/contrail/analytics/
+
 {{- end }}
 {{- end }}
diff --git a/contrail-analytics/templates/daemonset-query-engine.yaml b/contrail-analytics/templates/daemonset-query-engine.yaml
@@ -40,8 +40,13 @@ spec:
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       volumes:
+      - name: etc-contrail
+        hostPath:
+          path: /etc/contrail/analytics/
       - name: contrail-log
         hostPath:
-          path: /var/log/contrail/
+          path: /var/log/contrail/analytics/
 {{- end }}
diff --git a/contrail-analytics/templates/daemonset-snmp-collector.yaml b/contrail-analytics/templates/daemonset-snmp-collector.yaml
@@ -42,8 +42,13 @@ spec:
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       volumes:
+      - name: etc-contrail
+        hostPath:
+          path: /etc/contrail/analytics/
       - name: contrail-log
         hostPath:
-          path: /var/log/contrail/
+          path: /var/log/contrail/analytics/
 {{- end }}
diff --git a/contrail-analytics/templates/daemonset-topology.yaml b/contrail-analytics/templates/daemonset-topology.yaml
@@ -42,8 +42,13 @@ spec:
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       volumes:
+      - name: etc-contrail
+        hostPath:
+          path: /etc/contrail/analytics/
       - name: contrail-log
         hostPath:
-          path: /var/log/contrail/
+          path: /var/log/contrail/analytics/
 {{- end }}
diff --git a/contrail-analytics/values.yaml b/contrail-analytics/values.yaml
@@ -26,9 +26,6 @@ labels:
   analytics_nodemgr:
     node_selector_key: opencontrail.org/controller
     node_selector_value: "enabled"
-  analyticsdb_nodemgr:
-    node_selector_key: opencontrail.org/controller
-    node_selector_value: "enabled"
   query_engine:
     node_selector_key: opencontrail.org/controller
     node_selector_value: "enabled"
@@ -59,9 +56,6 @@ dependencies:
   contrail_topology:
     daemonset:
     - contrail-analytics
-  analytics_nodemgr:
-    daemonset:
-    - contrail-analytics
 
 contrail_env:
   CONTROLLER_NODES: 10.87.65.248

diff --git a/contrail-controller/templates/configmap-env.yaml b/contrail-controller/templates/configmap-env.yaml
@@ -44,16 +44,4 @@ data:
   RABBITMQ_USE_SSL: {{ .Values.contrail_env.RABBITMQ_USE_SSL | default "false" | quote }}
   RABBITMQ_VHOST: {{ .Values.endpoints.rabbitmq.path | default "/" | quote }}
 
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: webui-conf
-data:
-  webui_conf: |+
-    var auth = {};
-    auth.admin_user = {{ .Values.endpoints.keystone.auth.username }};
-    auth.admin_password = {{ .Values.endpoints.keystone.auth.password }};
-    auth.admin_token = '';
-    auth.admin_tenant_name = {{ .Values.endpoints.keystone.auth.project_name }};
 {{- end }}
diff --git a/contrail-controller/templates/daemonset-config-api.yaml b/contrail-controller/templates/daemonset-config-api.yaml
@@ -42,8 +42,13 @@ spec:
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       volumes:
+      - name: etc-contrail
+        hostPath:
+          path: /etc/contrail/config/
       - name: contrail-log
         hostPath:
-          path: /var/log/contrail/
+          path: /var/log/contrail/config/
 {{- end }}
diff --git a/contrail-controller/templates/daemonset-config-nodemgr.yaml b/contrail-controller/templates/daemonset-config-nodemgr.yaml
@@ -47,11 +47,16 @@ spec:
           name: docker-unix-socket
         - mountPath: /var/log/contrail/
           name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       volumes:
       - name: docker-unix-socket
         hostPath:
           path: /var/run
+      - name: etc-contrail
+        hostPath:
+          path: /etc/contrail/config/
       - name: contrail-log
         hostPath:
-          path: /var/log/contrail/
+          path: /var/log/contrail/config/
 {{- end }}
diff --git a/contrail-controller/templates/daemonset-config.yaml b/contrail-controller/templates/daemonset-config.yaml
@@ -43,6 +43,8 @@ spec:
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       - name: contrail-devicemgr
         image: {{ .Values.images.tags.config_devicemgr | quote }}
         imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
@@ -56,6 +58,8 @@ spec:
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       - name: contrail-schema-transformer
         image: {{ .Values.images.tags.config_schema_transformer | quote }}
         imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
@@ -69,6 +73,8 @@ spec:
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       - name: contrail-svcmonitor
         image: {{ .Values.images.tags.config_svcmonitor | quote }}
         imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
@@ -82,6 +88,8 @@ spec:
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       - name: contrail-config-nodemgr
         image: {{ .Values.images.tags.nodemgr | quote }}
         imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
@@ -105,12 +113,17 @@ spec:
           name: docker-unix-socket
         - mountPath: /var/log/contrail/
           name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       volumes:
       - name: docker-unix-socket
         hostPath:
           path: /var/run
+      - name: etc-contrail
+        hostPath:
+          path: /etc/contrail/config/
       - name: contrail-log
         hostPath:
-          path: /var/log/contrail/
+          path: /var/log/contrail/config/
 {{- end }}
 {{- end }}
diff --git a/contrail-controller/templates/daemonset-control-nodemgr.yaml b/contrail-controller/templates/daemonset-control-nodemgr.yaml
@@ -52,11 +52,16 @@ spec:
           name: docker-unix-socket
         - mountPath: /var/log/contrail/
           name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       volumes:
       - name: docker-unix-socket
         hostPath:
           path: /var/run
+      - name: etc-contrail
+        hostPath:
+          path: /etc/contrail/control/
       - name: contrail-log
         hostPath:
-          path: /var/log/contrail/
+          path: /var/log/contrail/control/
 {{- end }}
diff --git a/contrail-controller/templates/daemonset-control-only.yaml b/contrail-controller/templates/daemonset-control-only.yaml
@@ -42,8 +42,13 @@ spec:
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
+        - mountPath: /etc/contrail/
+          name: etc-contrail
       volumes:
+      - name: etc-contrail
+        hostPath:
+          path: /etc/contrail/control/
       - name: contrail-log
         hostPath:
-          path: /var/log/contrail/
+          path: /var/log/contrail/control/
 {{- end }}