Cleanup template formatting
This patch is meant to cleanup indentations in the templates, as well some other house keeping fixes. Closes-Bug: #1504685 Change-Id: I43f6cca8f449dea2db4de6a5308bfa5e4551838e
This commit is contained in:
parent
8f84055caf
commit
485d9a9018
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
echo starting services
|
||||
echo "starting services"
|
||||
systemctl daemon-reload
|
||||
for service in $NODE_SERVICES; do
|
||||
echo "activating service $service"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
|
||||
echo removing docker key
|
||||
echo "removing docker key"
|
||||
rm -f /etc/docker/key.json
|
||||
|
|
|
@ -23,4 +23,3 @@ vgcreate docker $DOCKER_DEV
|
|||
cat > /etc/sysconfig/docker-storage-setup <<EOF
|
||||
VG=docker
|
||||
EOF
|
||||
|
||||
|
|
|
@ -41,4 +41,3 @@ echo "creating flanneld config in etcd"
|
|||
curl -sf -L $FLANNEL_ETCD/v2/keys/coreos.com/network/config \
|
||||
-X PUT \
|
||||
--data-urlencode value@/etc/sysconfig/flannel-network.json
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ if [ "$REGISTRY_ENABLED" = "False" ]; then
|
|||
exit 0
|
||||
fi
|
||||
|
||||
echo starting docker registry ...
|
||||
echo "starting docker registry ..."
|
||||
systemctl daemon-reload
|
||||
systemctl enable registry
|
||||
systemctl --no-block start registry
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
#!/bin/sh
|
||||
|
||||
echo starting etcd
|
||||
echo "starting etcd"
|
||||
systemctl enable etcd
|
||||
systemctl --no-block start etcd
|
||||
|
||||
|
|
|
@ -3,11 +3,9 @@
|
|||
# make sure we pick up any modified unit files
|
||||
systemctl daemon-reload
|
||||
|
||||
echo starting services
|
||||
echo "starting services"
|
||||
for service in etcd kube-apiserver kube-scheduler kube-controller-manager; do
|
||||
echo "activating service $service"
|
||||
systemctl enable $service
|
||||
systemctl --no-block start $service
|
||||
done
|
||||
|
||||
|
||||
|
|
|
@ -15,4 +15,3 @@ for service in docker kubelet kube-proxy; do
|
|||
systemctl enable $service
|
||||
systemctl --no-block start $service
|
||||
done
|
||||
|
||||
|
|
|
@ -7,4 +7,3 @@ system_info:
|
|||
groups: [wheel, adm, systemd-journal]
|
||||
sudo: ["ALL=(ALL) NOPASSWD:ALL"]
|
||||
shell: /bin/bash
|
||||
|
||||
|
|
|
@ -2,7 +2,9 @@
|
|||
|
||||
. /etc/sysconfig/heat-params
|
||||
|
||||
if [ "$NETWORK_DRIVER" == "flannel" ]; then
|
||||
if [ "$NETWORK_DRIVER" != "flannel" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
. /etc/sysconfig/flanneld
|
||||
|
||||
|
@ -54,4 +56,3 @@ chmod 0644 $FLANNEL_CONFIG_SERVICE
|
|||
|
||||
systemctl enable flannel-config
|
||||
systemctl start --no-block flannel-config
|
||||
fi # end if [ "$NETWORK_DRIVER" == "flannel" ]
|
||||
|
|
|
@ -2,7 +2,9 @@
|
|||
|
||||
. /etc/sysconfig/heat-params
|
||||
|
||||
if [ "$NETWORK_DRIVER" == "flannel" ]; then
|
||||
if [ "$NETWORK_DRIVER" != "flannel" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
FLANNEL_DOCKER_BRIDGE_BIN=/usr/local/bin/flannel-docker-bridge
|
||||
FLANNEL_DOCKER_BRIDGE_SERVICE=/etc/systemd/system/flannel-docker-bridge.service
|
||||
|
@ -73,5 +75,3 @@ chmod 0644 $FLANNEL_DOCKER_BRIDGE_CONF
|
|||
echo "activating service flanneld"
|
||||
systemctl enable flanneld
|
||||
systemctl --no-block start flanneld
|
||||
|
||||
fi
|
||||
|
|
|
@ -19,4 +19,3 @@ monitor-delay=1m
|
|||
monitor-timeout=30s
|
||||
monitor-max-retries=3
|
||||
EOF
|
||||
|
||||
|
|
|
@ -2,7 +2,10 @@
|
|||
|
||||
. /etc/sysconfig/heat-params
|
||||
|
||||
if [ "$NETWORK_DRIVER" == "flannel" ]; then
|
||||
if [ "$NETWORK_DRIVER" != "flannel" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
. /etc/sysconfig/flanneld
|
||||
|
||||
FLANNEL_JSON=/etc/sysconfig/flannel-network.json
|
||||
|
@ -39,5 +42,3 @@ fi
|
|||
cat >> $FLANNEL_JSON <<EOF
|
||||
}
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
|
|
@ -20,4 +20,6 @@ echo "$myip" > /etc/mesos-slave/ip
|
|||
echo "docker,mesos" > /etc/mesos-slave/containerizers
|
||||
|
||||
# Amount of time to wait for an executor to register
|
||||
echo "$EXECUTOR_REGISTRATION_TIMEOUT" > /etc/mesos-slave/executor_registration_timeout
|
||||
cat > /etc/mesos-slave/executor_registration_timeout <<EOF
|
||||
$EXECUTOR_REGISTRATION_TIMEOUT
|
||||
EOF
|
||||
|
|
Loading…
Reference in New Issue