Kubelet env.list updated for ansible variable

Signed-off-by: Balint Varga <balint.varga@nokia.com>
Change-Id: Ic40836b4291d7c5b5e24f52677c30a7268322ed8

diff --git a/ansible/roles/kubelet/templates/env.list b/ansible/roles/kubelet/templates/env.list
index 9607b05..367f606 100644 (file)
--- a/ansible/roles/kubelet/templates/env.list
+++ b/ansible/roles/kubelet/templates/env.list
@@ -15,9 +15,9 @@ limitations under the License.
 #}
 API_SERVERS=https://{{ caas.apiserver_svc_ip }}:{{ caas.apiserver_svc_port }}
 CLIENT_CA_CERT=/etc/openssl/ca.pem
-CLIENT_CERT=/etc/docker/client{{ nodeindex }}.pem
-CLIENT_KEY=/etc/docker/client{{ nodeindex }}-key.pem
+CLIENT_CERT={{ caas.cert_path }}/docker-client{{ nodeindex }}.pem
+CLIENT_KEY={{ caas.cert_path }}/docker-client{{ nodeindex }}-key.pem
 DANM_POSTFIX=kubernetes.nokia.com
-DOCKER_CERT_PATH=/etc/docker
+DOCKER_CERT_PATH={{ caas.cert_directory }}
 DOCKER_HOST=tcp://{{ ansible_host }}:2375
 DOCKER_TLS_VERIFY=1

diff --git a/caas-kubernetes.spec b/caas-kubernetes.spec
index d424dfc..8825586 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.15.1
-%define RPM_MINOR_VERSION 0
+%define RPM_MINOR_VERSION 1
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define KUBERNETESPAUSE_VERSION 3.1