Merge "Fix k8s_fedora to work with cinder volume driver"
This commit is contained in:
commit
b6efd04613
|
@ -25,7 +25,8 @@ sed -i '
|
||||||
/^KUBE_MASTER=/ s|=.*|="--master='"$KUBE_MASTER_URI"'"|
|
/^KUBE_MASTER=/ s|=.*|="--master='"$KUBE_MASTER_URI"'"|
|
||||||
' /etc/kubernetes/config
|
' /etc/kubernetes/config
|
||||||
|
|
||||||
KUBELET_ARGS="--config=/etc/kubernetes/manifests --cadvisor-port=4194 --hostname-override=$KUBE_NODE_IP ${KUBE_CONFIG}"
|
HOSTNAME=$(hostname --short | sed 's/\.novalocal//')
|
||||||
|
KUBELET_ARGS="--config=/etc/kubernetes/manifests --cadvisor-port=4194 ${KUBE_CONFIG}"
|
||||||
|
|
||||||
if [ -n "${INSECURE_REGISTRY_URL}" ]; then
|
if [ -n "${INSECURE_REGISTRY_URL}" ]; then
|
||||||
KUBELET_ARGS="${KUBELET_ARGS} --pod-infra-container-image=${INSECURE_REGISTRY_URL}/google_containers/pause\:0.8.0"
|
KUBELET_ARGS="${KUBELET_ARGS} --pod-infra-container-image=${INSECURE_REGISTRY_URL}/google_containers/pause\:0.8.0"
|
||||||
|
@ -36,7 +37,7 @@ sed -i '
|
||||||
/^KUBELET_ADDRESS=/ s/=.*/="--address=0.0.0.0"/
|
/^KUBELET_ADDRESS=/ s/=.*/="--address=0.0.0.0"/
|
||||||
/^KUBELET_HOSTNAME=/ s/=.*/=""/
|
/^KUBELET_HOSTNAME=/ s/=.*/=""/
|
||||||
/^KUBELET_API_SERVER=/ s|=.*|="--api_servers='"$KUBE_MASTER_URI"'"|
|
/^KUBELET_API_SERVER=/ s|=.*|="--api_servers='"$KUBE_MASTER_URI"'"|
|
||||||
/^KUBELET_ARGS=/ s|=.*|='"${KUBELET_ARGS}"'|
|
/^KUBELET_ARGS=/ s|=.*|="'"${KUBELET_ARGS}"' --hostname-override='"${KUBE_NODE_IP}"'"|
|
||||||
' /etc/kubernetes/kubelet
|
' /etc/kubernetes/kubelet
|
||||||
|
|
||||||
sed -i '
|
sed -i '
|
||||||
|
@ -63,7 +64,7 @@ if [ "$VOLUME_DRIVER" = "cinder" ]; then
|
||||||
if [ ! -d ${KUBERNETES} -o ! -f ${CLOUD_CONFIG} ]; then
|
if [ ! -d ${KUBERNETES} -o ! -f ${CLOUD_CONFIG} ]; then
|
||||||
sudo mkdir -p $KUBERNETES
|
sudo mkdir -p $KUBERNETES
|
||||||
fi
|
fi
|
||||||
AUTH_URL=$(echo "$AUTH_URL" | sed 's/v3/v2/')
|
AUTH_URL=${AUTH_URL/v3/v2.0}
|
||||||
cat > $CLOUD_CONFIG <<EOF
|
cat > $CLOUD_CONFIG <<EOF
|
||||||
[Global]
|
[Global]
|
||||||
auth-url=$AUTH_URL
|
auth-url=$AUTH_URL
|
||||||
|
@ -74,7 +75,7 @@ tenant-name=$TENANT_NAME
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat << _EOC_ >> /etc/kubernetes/kubelet
|
cat << _EOC_ >> /etc/kubernetes/kubelet
|
||||||
#KUBELET_ARGS="$KUBELET_ARGS --cloud-provider=openstack --cloud-config=/etc/kubernetes/kube_openstack_config"
|
#KUBELET_ARGS="$KUBELET_ARGS --hostname-override=${HOSTNAME} --cloud-provider=openstack --cloud-config=/etc/kubernetes/kube_openstack_config"
|
||||||
_EOC_
|
_EOC_
|
||||||
|
|
||||||
if [ ! -f /usr/bin/udevadm ]; then
|
if [ ! -f /usr/bin/udevadm ]; then
|
||||||
|
|
Loading…
Reference in New Issue