From 235d4f3d5ffdeedf8c0b150c1e62edcf1f97f1be Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <andrey.mp@gmail.com>
Date: Mon, 16 Jul 2018 14:16:38 +0300
Subject: [PATCH] Fix nodemgr definitions due to config-database nodemgr

Partial-Bug: #1765487
Change-Id: Icf0d1aa8d212837e572812c2a07c36e0ff2a5047
---
 .../templates/contrail-installer-5.1.j2       | 33 ++++++++++++++-----
 .../templates/contrail-installer-5.j2         | 33 ++++++++++++++-----
 2 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/roles/contrail_master/templates/contrail-installer-5.1.j2 b/roles/contrail_master/templates/contrail-installer-5.1.j2
index 0c69d9db8fb..e5ae27e2a15 100644
--- a/roles/contrail_master/templates/contrail-installer-5.1.j2
+++ b/roles/contrail_master/templates/contrail-installer-5.1.j2
@@ -244,7 +244,7 @@ spec:
           name: analyticsdb-data
         - mountPath: /var/log/cassandra
           name: analyticsdb-log
-      - name: contrail-analytics-nodemgr
+      - name: contrail-analyticsdb-nodemgr
         image: "ci-repo.englab.juniper.net:5000/contrail-nodemgr:{{ contrail_container_tag }}"
         imagePullPolicy: ""
         securityContext:
@@ -255,7 +255,7 @@ spec:
         - configMapRef:
             name: nodemgr-config
         - configMapRef:
-            name: contrail-analytics-zookeeper
+            name: contrail-analyticsdb-config
         env:
         - name: NODE_TYPE
           value: database
@@ -316,6 +316,24 @@ spec:
           name: configdb-data
         - mountPath: /var/log/cassandra
           name: configdb-log
+      - name: contrail-configdb-nodemgr
+        image: "ci-repo.englab.juniper.net:5000/contrail-nodemgr:{{ contrail_container_tag }}"
+        imagePullPolicy: ""
+        securityContext:
+          privileged: true
+        envFrom:
+        - configMapRef:
+            name: env
+        - configMapRef:
+            name: nodemgr-config
+        - configMapRef:
+            name: contrail-configdb-config
+        env:
+        - name: NODE_TYPE
+          value: config-database
+        volumeMounts:
+        - mountPath: /mnt
+          name: docker-unix-socket
       volumes:
       - name: configdb-data
         hostPath:
@@ -323,6 +341,9 @@ spec:
       - name: configdb-log
         hostPath:
           path: /var/log/contrail/configdb
+      - name: docker-unix-socket
+        hostPath:
+          path: /var/run
 {% if contrail_registry_username is defined and contrail_registry_password %}
       imagePullSecrets:
       - name: contrail-registry-secret
@@ -476,8 +497,6 @@ spec:
             name: env
         - configMapRef:
             name: nodemgr-config
-        - configMapRef:
-            name: contrail-analytics-zookeeper
         env:
         - name: NODE_TYPE
           value: analytics
@@ -592,7 +611,7 @@ spec:
           name: dns-config
         - mountPath: /var/log/contrail
           name: control-logs
-      - name: contrail-controller-nodemgr
+      - name: contrail-controller-control-nodemgr
         image: "{{ contrail_registry }}/contrail-nodemgr:{{ contrail_container_tag }}"
         imagePullPolicy: ""
         securityContext:
@@ -602,8 +621,6 @@ spec:
             name: env
         - configMapRef:
             name: nodemgr-config
-        - configMapRef:
-            name: contrail-config-zookeeper
         env:
         - name: NODE_TYPE
           value: control
@@ -739,8 +756,6 @@ spec:
             name: env
         - configMapRef:
             name: nodemgr-config
-        - configMapRef:
-            name: contrail-config-zookeeper
         env:
         - name: NODE_TYPE
           value: config
diff --git a/roles/contrail_master/templates/contrail-installer-5.j2 b/roles/contrail_master/templates/contrail-installer-5.j2
index 6b57b01967a..59125868f98 100644
--- a/roles/contrail_master/templates/contrail-installer-5.j2
+++ b/roles/contrail_master/templates/contrail-installer-5.j2
@@ -292,7 +292,7 @@ spec:
           name: analyticsdb-data
         - mountPath: /var/log/cassandra
           name: analyticsdb-log
-      - name: contrail-analytics-nodemgr
+      - name: contrail-analyticsdb-nodemgr
         image: "{{ contrail_registry }}/contrail-nodemgr:{{ contrail_container_tag }}"
         imagePullPolicy: ""
         securityContext:
@@ -303,7 +303,7 @@ spec:
         - configMapRef:
             name: nodemgr-config
         - configMapRef:
-            name: contrail-analytics-zookeeper
+            name: contrail-analyticsdb-config
         env:
         - name: NODE_TYPE
           value: database
@@ -364,6 +364,24 @@ spec:
           name: configdb-data
         - mountPath: /var/log/cassandra
           name: configdb-log
+      - name: contrail-configdb-nodemgr
+        image: "{{ contrail_registry }}/contrail-nodemgr:{{ contrail_container_tag }}"
+        imagePullPolicy: ""
+        securityContext:
+          privileged: true
+        envFrom:
+        - configMapRef:
+            name: env
+        - configMapRef:
+            name: nodemgr-config
+        - configMapRef:
+            name: contrail-configdb-config
+        env:
+        - name: NODE_TYPE
+          value: config-database
+        volumeMounts:
+        - mountPath: /mnt
+          name: docker-unix-socket
       volumes:
       - name: configdb-data
         hostPath:
@@ -371,6 +389,9 @@ spec:
       - name: configdb-log
         hostPath:
           path: /var/log/contrail/configdb
+      - name: docker-unix-socket
+        hostPath:
+          path: /var/run
 {% if contrail_registry_username is defined and contrail_registry_password %}
       imagePullSecrets:
       - name: contrail-registry-secret
@@ -563,8 +584,6 @@ spec:
             name: env
         - configMapRef:
             name: nodemgr-config
-        - configMapRef:
-            name: contrail-analytics-zookeeper
         env:
         - name: NODE_TYPE
           value: analytics
@@ -679,7 +698,7 @@ spec:
           name: dns-config
         - mountPath: /var/log/contrail
           name: control-logs
-      - name: contrail-controller-nodemgr
+      - name: contrail-controller-control-nodemgr
         image: "{{ contrail_registry }}/contrail-nodemgr:{{ contrail_container_tag }}"
         imagePullPolicy: ""
         securityContext:
@@ -689,8 +708,6 @@ spec:
             name: env
         - configMapRef:
             name: nodemgr-config
-        - configMapRef:
-            name: contrail-config-zookeeper
         env:
         - name: NODE_TYPE
           value: control
@@ -826,8 +843,6 @@ spec:
             name: env
         - configMapRef:
             name: nodemgr-config
-        - configMapRef:
-            name: contrail-config-zookeeper
         env:
         - name: NODE_TYPE
           value: config