Kubeadm-aio: Fix echo outputs
This PS fixes the quotes round the echo statments. Though mostly cosmetic, it is needed for some things that slipped thorough with ! them. Change-Id: Ie752cc88732192c51e97a2f44f554ad0474f09e5
This commit is contained in:
parent
00e76c1572
commit
3f894c65ea
@ -15,23 +15,23 @@
|
||||
# under the License.
|
||||
set -xe
|
||||
|
||||
echo "Checking cgroups"
|
||||
echo 'Checking cgroups'
|
||||
if ls -dZ /sys/fs/cgroup | grep -q :svirt_sandbox_file_t: ; then
|
||||
echo "Invocation error: use -v /sys/fs/cgroup:/sys/fs/cgroup:ro parameter to docker run."
|
||||
echo 'Invocation error: use -v /sys/fs/cgroup:/sys/fs/cgroup:ro parameter to docker run.'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Setting up K8s version to deploy"
|
||||
echo 'Setting up K8s version to deploy'
|
||||
: ${KUBE_VERSION:="default"}
|
||||
sed -i "s|KUBE_VERSION=.*|KUBE_VERSION=${KUBE_VERSION}|g" /etc/kube-version
|
||||
|
||||
echo "Setting up device image to use for kube-api"
|
||||
echo 'Setting up device image to use for kube-api'
|
||||
: ${KUBE_BIND_DEV:="autodetect"}
|
||||
sed -i "s|KUBE_BIND_DEV=.*|KUBE_BIND_DEV=${KUBE_BIND_DEV}|g" /etc/kubeapi-device
|
||||
|
||||
echo "Setting up container image to use for kubelet"
|
||||
echo 'Setting up container image to use for kubelet'
|
||||
: ${KUBELET_CONTAINER:="this_one"}
|
||||
sed -i "s|KUBELET_CONTAINER=.*|KUBELET_CONTAINER=${KUBELET_CONTAINER}|g" /etc/kubelet-container
|
||||
|
||||
echo "Starting Systemd"
|
||||
echo 'Starting Systemd'
|
||||
exec /bin/systemd --system
|
||||
|
@ -24,25 +24,25 @@ else
|
||||
echo "We will use K8s ${KUBE_VERSION}"
|
||||
fi
|
||||
|
||||
echo "Setting up K8s"
|
||||
echo 'Setting up K8s'
|
||||
source /etc/kubeapi-device
|
||||
if [[ "$KUBE_BIND_DEV" != "autodetect" ]]; then
|
||||
KUBE_BIND_IP=$(ip addr list ${KUBE_BIND_DEV} |grep "inet " |cut -d' ' -f6|cut -d/ -f1)
|
||||
echo "We are going to bind the K8s API to: ${KUBE_BIND_IP}"
|
||||
echo 'We are going to bind the K8s API to: ${KUBE_BIND_IP}'
|
||||
kubeadm init --skip-preflight-checks ${KUBE_VERSION_FLAG} --api-advertise-addresses ${KUBE_BIND_IP}
|
||||
else
|
||||
kubeadm init --skip-preflight-checks ${KUBE_VERSION_FLAG}
|
||||
fi
|
||||
|
||||
echo "Setting up K8s client"
|
||||
echo 'Setting up K8s client'
|
||||
cp /etc/kubernetes/admin.conf /root/
|
||||
export KUBECONFIG=/root/admin.conf
|
||||
|
||||
echo "Marking master node as sceduleable"
|
||||
echo 'Marking master node as schedulable'
|
||||
kubectl taint nodes --all node-role.kubernetes.io/master-
|
||||
|
||||
echo "Installing Calico CNI"
|
||||
echo 'Installing Calico CNI'
|
||||
kubectl create -f http://docs.projectcalico.org/v2.1/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml
|
||||
|
||||
echo "Setting Up Cluser for OpenStack-Helm dev use"
|
||||
echo 'Setting Up Cluser for OpenStack-Helm dev use'
|
||||
/usr/bin/openstack-helm-dev-prep
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
set -xe
|
||||
|
||||
echo "Setting up virtual network devices"
|
||||
echo 'Setting up virtual network devices'
|
||||
ip link add neutron-ext type dummy || true
|
||||
ip link set neutron-ext up
|
||||
ip link add neutron-phys type dummy || true
|
||||
|
@ -15,20 +15,20 @@
|
||||
# under the License.
|
||||
set -xe
|
||||
|
||||
echo "Setting Kubecfg Location"
|
||||
echo 'Setting Kubecfg Location'
|
||||
export KUBECONFIG=/root/admin.conf
|
||||
|
||||
echo "Cloning OpenStack-Helm"
|
||||
echo 'Cloning OpenStack-Helm'
|
||||
git clone --depth 1 https://github.com/openstack/openstack-helm.git /opt/openstack-helm
|
||||
|
||||
echo "Starting helm local repo"
|
||||
echo 'Starting helm local repo'
|
||||
helm serve &
|
||||
until curl -sSL --connect-timeout 1 http://localhost:8879 > /dev/null; do
|
||||
echo "Waiting for helm serve to start"
|
||||
echo 'Waiting for helm serve to start'
|
||||
sleep 2
|
||||
done
|
||||
helm repo add local http://localhost:8879/charts
|
||||
|
||||
echo "Building OpenStack-Helm"
|
||||
echo 'Building OpenStack-Helm'
|
||||
cd /opt/openstack-helm
|
||||
make
|
||||
|
@ -15,14 +15,13 @@
|
||||
# under the License.
|
||||
set -xe
|
||||
|
||||
echo "Setting Kubecfg Location"
|
||||
echo 'Setting Kubecfg Location'
|
||||
export KUBECONFIG=/root/admin.conf
|
||||
|
||||
echo "Labeling the nodes for Openstack-Helm deployment"
|
||||
echo 'Labeling the nodes for Openstack-Helm deployment'
|
||||
kubectl label nodes openstack-control-plane=enabled --all --namespace=openstack --overwrite
|
||||
kubectl label nodes openvswitch=enabled --all --namespace=openstack --overwrite
|
||||
kubectl label nodes openstack-compute-node=enabled --all --namespace=openstack --overwrite
|
||||
|
||||
|
||||
echo "RBAC: applying development rules (totally open!)"
|
||||
echo 'RBAC: applying development rules (totally open!)'
|
||||
kubectl update -f /opt/rbac/dev.yaml
|
||||
|
@ -15,8 +15,8 @@
|
||||
# under the License.
|
||||
set -xe
|
||||
|
||||
echo "Setting Kubecfg Location"
|
||||
echo 'Setting Kubecfg Location'
|
||||
export KUBECONFIG=/root/admin.conf
|
||||
|
||||
echo "Deploying NFS Provisioner"
|
||||
echo 'Deploying NFS Provisioner'
|
||||
kubectl create -R -f /opt/nfs-provisioner/
|
||||
|
Loading…
Reference in New Issue
Block a user