Kubernetes refactered node role.

Change-Id: I2c004fde3442016d539341edb521f48dd7b8687d
Signed-off-by: Balazs Szekeres <balazs.szekeres@nokia.com>

diff --git a/ansible/roles/set_nodes_label/tasks/main.yml b/ansible/roles/set_nodes_label/tasks/main.yml
index 2592084..49e06da 100644 (file)
--- a/ansible/roles/set_nodes_label/tasks/main.yml
+++ b/ansible/roles/set_nodes_label/tasks/main.yml
@@ -14,5 +14,5 @@
 # limitations under the License.
 
 - name: set node role for cluster member
-  shell: "kubectl label node {{ networking.infra_internal.ip }} kubernetes.io/role={{ noderole }}"
+  shell: "kubectl label node {{ networking.infra_internal.ip }} kubernetes.io/role={{ hosts[hostname]['noderole'] }}"
 

diff --git a/caas-kubernetes.spec b/caas-kubernetes.spec
index 762f775..5d1594d 100644 (file)
--- a/caas-kubernetes.spec
+++ b/caas-kubernetes.spec
@@ -15,7 +15,7 @@
 %define COMPONENT kubernetes
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.16.0
-%define RPM_MINOR_VERSION 6
+%define RPM_MINOR_VERSION 7
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define KUBERNETESPAUSE_VERSION 3.1