From 235d57c7d1f3690ee586d678c82d4cc4b2094418 Mon Sep 17 00:00:00 2001 From: Krisztian Lengyel Date: Mon, 29 Apr 2019 14:52:24 +0200 Subject: [PATCH] Remove hardcoded libexec directory path Change-Id: I3caab31b031fbf306ddcf8e6940b1b349c63a537 Depends-On: I2969223948218155aff121c20731eb336c13fca6 Signed-off-by: Krisztian Lengyel --- ansible/roles/kubelet/tasks/configure_kubelet.yml | 3 +-- ansible/roles/kubelet/templates/kubelet.service | 4 ++-- ansible/roles/kubelet/templates/kubelet_healthcheck.service | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ansible/roles/kubelet/tasks/configure_kubelet.yml b/ansible/roles/kubelet/tasks/configure_kubelet.yml index 7d3bd04..b73084c 100644 --- a/ansible/roles/kubelet/tasks/configure_kubelet.yml +++ b/ansible/roles/kubelet/tasks/configure_kubelet.yml @@ -42,7 +42,7 @@ - name: template kubelet scripts template: src: "{{ item }}" - dest: /usr/libexec/nokia/{{ item }} + dest: "{{ caas.libexec_dir }}/{{ item }}" mode: 0700 with_items: - kubelet_start.sh @@ -65,4 +65,3 @@ path: "/etc/kubernetes/kubeconfig/kubeletc.yml" state: touch when: hostname in groups.caas_worker - diff --git a/ansible/roles/kubelet/templates/kubelet.service b/ansible/roles/kubelet/templates/kubelet.service index ba73ec5..572dfc9 100644 --- a/ansible/roles/kubelet/templates/kubelet.service +++ b/ansible/roles/kubelet/templates/kubelet.service @@ -32,11 +32,11 @@ TimeoutStopSec=45s RestartSec=10s EnvironmentFile=/etc/kubernetes/env.list -ExecStartPre=/usr/libexec/nokia/kubelet_start.sh +ExecStartPre={{ caas.libexec_dir }}/kubelet_start.sh ExecStart=/usr/bin/kubelet {{ kubelet_params | join(' ') }} -ExecStop=/usr/libexec/nokia/kubelet_stop.sh +ExecStop={{ caas.libexec_dir }}/kubelet_stop.sh Restart=always LimitNOFILE=65536 diff --git a/ansible/roles/kubelet/templates/kubelet_healthcheck.service b/ansible/roles/kubelet/templates/kubelet_healthcheck.service index 70a55a3..11009ed 100644 --- a/ansible/roles/kubelet/templates/kubelet_healthcheck.service +++ b/ansible/roles/kubelet/templates/kubelet_healthcheck.service @@ -28,7 +28,7 @@ Type=simple User=root RestartSec=10s -ExecStart=/usr/libexec/nokia/kubelet_healthcheck.sh +ExecStart={{ caas.libexec_dir }}/kubelet_healthcheck.sh Restart=always LimitNOFILE=65536 -- 2.16.6