66ebe442c2
When we start or restart the heat-agent, we run configure_container_agent.sh which writes a few scripts. Make sure that the scipts do not exist before writing to avoid overwriting any values created on runtime. When the heat-agent starts, /etc/os-collect-config.conf includes only the reference to the os-refresh-config command. After the agent bootstap, this file contains the credentials to check for software deployments in the [heat] section. Before this patch, when the agent restarted /etc/os-collect-config.conf was cleared resulting the agent to stop working. I have the survive restarts, skiping only os-collect-config.conf should be enough, but it is better to not touch files on just service restart. Additionally, fix file permissions for /etc/os-collect-config.conf. Change heat-container-agent tag to ussuri-dev. Change-Id: I3efd4e55e885b95721f13279b44dc1246e2fd2e4 Signed-off-by: Spyros Trigazis <spyridon.trigazis@cern.ch>
13 lines
457 B
Bash
Executable File
13 lines
457 B
Bash
Executable File
#!/bin/sh
|
|
|
|
. /etc/kubernetes/apiserver
|
|
. /etc/kubernetes/config
|
|
|
|
ARGS="$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_ETCD_SERVERS $KUBE_API_ADDRESS $KUBE_API_PORT $KUBELET_PORT $KUBE_ALLOW_PRIV $KUBE_SERVICE_ADDRESSES $KUBE_ADMISSION_CONTROL $KUBE_API_ARGS"
|
|
|
|
ARGS=$(echo $ARGS | sed s#--tls-ca-file=/etc/kubernetes/certs/ca.crt##)
|
|
# KubeletPluginsWatcher=true,
|
|
ARGS=$(echo $ARGS | sed s/KubeletPluginsWatcher=true,//)
|
|
|
|
exec /usr/local/bin/kube-apiserver $ARGS
|