"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh" between
magnum-8.0.0.tar.gz and magnum-8.1.0.tar.gz

About: OpenStack Magnum makes container orchestration engines such as Docker and Kubernetes available as first class resources in OpenStack.
The "Stein" series (latest release).

write-kube-os-config.sh  (magnum-8.0.0):write-kube-os-config.sh  (magnum-8.1.0)
#!/bin/sh #!/bin/sh
. /etc/sysconfig/heat-params . /etc/sysconfig/heat-params
mkdir -p /etc/kubernetes/ mkdir -p /etc/kubernetes/
if [ -z "${TRUST_ID}" ]; then
exit 0
fi
KUBE_OS_CLOUD_CONFIG=/etc/kubernetes/cloud-config
cp /etc/pki/tls/certs/ca-bundle.crt /etc/kubernetes/ca-bundle.crt cp /etc/pki/tls/certs/ca-bundle.crt /etc/kubernetes/ca-bundle.crt
# Generate a the configuration for Kubernetes services if [ -n "${TRUST_ID}" ]; then
# to talk to OpenStack Neutron and Cinder KUBE_OS_CLOUD_CONFIG=/etc/kubernetes/cloud-config
cat > $KUBE_OS_CLOUD_CONFIG <<EOF
# Generate a the configuration for Kubernetes services
# to talk to OpenStack Neutron and Cinder
cat > ${KUBE_OS_CLOUD_CONFIG} <<EOF
[Global] [Global]
auth-url=$AUTH_URL auth-url=$AUTH_URL
user-id=$TRUSTEE_USER_ID user-id=$TRUSTEE_USER_ID
password=$TRUSTEE_PASSWORD password=$TRUSTEE_PASSWORD
trust-id=$TRUST_ID trust-id=$TRUST_ID
ca-file=/etc/kubernetes/ca-bundle.crt ca-file=/etc/kubernetes/ca-bundle.crt
[LoadBalancer] [LoadBalancer]
use-octavia=$OCTAVIA_ENABLED use-octavia=$OCTAVIA_ENABLED
subnet-id=$CLUSTER_SUBNET subnet-id=$CLUSTER_SUBNET
floating-network-id=$EXTERNAL_NETWORK_ID floating-network-id=$EXTERNAL_NETWORK_ID
create-monitor=yes create-monitor=yes
monitor-delay=1m monitor-delay=1m
monitor-timeout=30s monitor-timeout=30s
monitor-max-retries=3 monitor-max-retries=3
[BlockStorage] [BlockStorage]
bs-version=v2 bs-version=v2
EOF EOF
# Provide optional region parameter if it's set. # Provide optional region parameter if it's set.
if [ -n ${REGION_NAME} ]; then if [ -n "${REGION_NAME}" ]; then
sed -i '/ca-file/a region='${REGION_NAME}'' $KUBE_OS_CLOUD_CONFIG sed -i '/ca-file/a region='${REGION_NAME}'' $KUBE_OS_CLOUD_CONFIG
fi fi
# backwards compatibility, some apps may expect this file from previous magnum v # backwards compatibility, some apps may expect this file from previous magn
ersions. um versions.
cp ${KUBE_OS_CLOUD_CONFIG} /etc/kubernetes/kube_openstack_config cp ${KUBE_OS_CLOUD_CONFIG} /etc/kubernetes/kube_openstack_config
fi
 End of changes. 4 change blocks. 
13 lines changed or deleted 10 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)