From 16066adf111b7dfe29d52fc26768dfd317f3c139 Mon Sep 17 00:00:00 2001
From: mattmceuen <madgin@madgin.net>
Date: Sun, 15 Jan 2017 15:25:40 -0600
Subject: [PATCH] Trued up nodeselector values for nova and neutron

The Nova and Neutron charts use more granular node labels;
this trues up the their jobs' nodeselectors to use them.

Fix for https://github.com/att-comdev/openstack-helm/issues/119
---
 neutron/templates/job-db-sync.yaml | 4 ++--
 neutron/templates/job-init.yaml    | 4 ++--
 neutron/templates/job-post.yaml    | 4 ++--
 nova/templates/job-db-sync.yaml    | 2 +-
 nova/templates/job-init.yaml       | 2 +-
 nova/templates/job-post.yaml       | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/neutron/templates/job-db-sync.yaml b/neutron/templates/job-db-sync.yaml
index ff546f790b..e34f36dc3a 100644
--- a/neutron/templates/job-db-sync.yaml
+++ b/neutron/templates/job-db-sync.yaml
@@ -7,7 +7,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }}
       containers:
         - name: neutron-db-sync
           image: {{ .Values.images.db_sync }}
@@ -42,4 +42,4 @@ spec:
             name: neutron-etc
         - name: ml2confini
           configMap:
-            name: neutron-etc
\ No newline at end of file
+            name: neutron-etc
diff --git a/neutron/templates/job-init.yaml b/neutron/templates/job-init.yaml
index ef29d574a6..d7d3401714 100644
--- a/neutron/templates/job-init.yaml
+++ b/neutron/templates/job-init.yaml
@@ -7,7 +7,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }}
       containers:
         - name: neutron-init
           image: {{ .Values.images.init }}
@@ -36,4 +36,4 @@ spec:
       volumes:
         - name: initsh
           configMap:
-            name: neutron-bin
\ No newline at end of file
+            name: neutron-bin
diff --git a/neutron/templates/job-post.yaml b/neutron/templates/job-post.yaml
index 847a19274e..6c3a05d280 100644
--- a/neutron/templates/job-post.yaml
+++ b/neutron/templates/job-post.yaml
@@ -7,7 +7,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }}
       containers:
         - name: neutron-post
           image: {{ .Values.images.post }}
@@ -38,4 +38,4 @@ spec:
       volumes:
         - name: postsh
           configMap:
-            name: neutron-bin
\ No newline at end of file
+            name: neutron-bin
diff --git a/nova/templates/job-db-sync.yaml b/nova/templates/job-db-sync.yaml
index da81fe0e13..7a1404f450 100644
--- a/nova/templates/job-db-sync.yaml
+++ b/nova/templates/job-db-sync.yaml
@@ -34,7 +34,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: nova-db-sync
           image: {{ .Values.image.db_sync }}
diff --git a/nova/templates/job-init.yaml b/nova/templates/job-init.yaml
index 2ca373358a..7081a1e44e 100644
--- a/nova/templates/job-init.yaml
+++ b/nova/templates/job-init.yaml
@@ -34,7 +34,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: nova-init
           image: {{ .Values.image.init }}
diff --git a/nova/templates/job-post.yaml b/nova/templates/job-post.yaml
index e22373e02f..e75cf0f51f 100644
--- a/nova/templates/job-post.yaml
+++ b/nova/templates/job-post.yaml
@@ -34,7 +34,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: nova-post
           image: {{ .Values.image.post }}