From 8e341b4e831ece145b02691393e501ce0d9b902a Mon Sep 17 00:00:00 2001 From: Andrii Ostapenko Date: Mon, 1 Mar 2021 14:00:10 -0600 Subject: [PATCH] Execute systemctl daemon-reload to update docker unit proxy settings Change-Id: Ifeaade1976d935b1f8026a723981b3f3e03d37bc Signed-off-by: Andrii Ostapenko --- manifests/function/ephemeral/secret.yaml | 2 ++ manifests/function/k8scontrol/controlplane.yaml | 1 + .../target/workers/provision/kubeadmconfigtemplate.yaml | 1 + 3 files changed, 4 insertions(+) diff --git a/manifests/function/ephemeral/secret.yaml b/manifests/function/ephemeral/secret.yaml index 0970a7ed8..d7e55a23e 100644 --- a/manifests/function/ephemeral/secret.yaml +++ b/manifests/function/ephemeral/secret.yaml @@ -26,6 +26,8 @@ stringData: gecos: deployer ssh_pwauth: True runcmd: + - systemctl daemon-reload + - systemctl restart docker - /bin/bash -c 'kernel_libsubdir="$(ls /lib/modules | head -1)"; config_dir="/lib/modules/${kernel_libsubdir}/build"; mkdir -p "${config_dir}"; if [ -f /run/live/medium/config ] && [ ! -f "${config_dir}/.config" ]; then ln -s /run/live/medium/config "${config_dir}/.config"; fi;' - kubeadm init --config /tmp/kubeadm.yaml - mkdir -p /opt/metal3-dev-env/ironic/html/images diff --git a/manifests/function/k8scontrol/controlplane.yaml b/manifests/function/k8scontrol/controlplane.yaml index 71d4d264d..ef69a640a 100644 --- a/manifests/function/k8scontrol/controlplane.yaml +++ b/manifests/function/k8scontrol/controlplane.yaml @@ -24,6 +24,7 @@ spec: preKubeadmCommands: # Restart docker to apply any proxy settings - export HOME=/root + - systemctl daemon-reload - systemctl restart docker initConfiguration: nodeRegistration: diff --git a/manifests/site/test-site/target/workers/provision/kubeadmconfigtemplate.yaml b/manifests/site/test-site/target/workers/provision/kubeadmconfigtemplate.yaml index 710d2b096..a5e6cd22c 100644 --- a/manifests/site/test-site/target/workers/provision/kubeadmconfigtemplate.yaml +++ b/manifests/site/test-site/target/workers/provision/kubeadmconfigtemplate.yaml @@ -22,6 +22,7 @@ spec: preKubeadmCommands: # Restart docker to apply any proxy settings - export HOME=/root + - systemctl daemon-reload - systemctl restart docker users: - name: deployer