Make etcd.conf editing more robust
The AWK incantation that we used to remove an existing /usr/bin/etcd invocation from /etc/init/etcd.conf did not work correctly if there was nothing in the file after that invocation; it left the final line of the invocation in place. This commit simplifies and improves the script so that it works in that case. Change-Id: Icc82ed36485b24468b02eabddac86ae73ea6a29b
This commit is contained in:
parent
859bbbb426
commit
b2c0af1a80
|
@ -60,7 +60,7 @@ initial_cluster=${initial_cluster::-1} # remove trailing comma
|
||||||
|
|
||||||
service etcd stop
|
service etcd stop
|
||||||
rm -rf /var/lib/etcd/*
|
rm -rf /var/lib/etcd/*
|
||||||
awk '/exec \/usr\/bin\/etcd/{while(getline && $0 != ""){}}1' /etc/init/etcd.conf > tmp
|
awk 'BEGIN{p=1}/exec \/usr\/bin\/etcd/{p=0}/^\s*$/{p=1}p' /etc/init/etcd.conf > tmp
|
||||||
mv tmp /etc/init/etcd.conf
|
mv tmp /etc/init/etcd.conf
|
||||||
cat << EXEC_CMD >> /etc/init/etcd.conf
|
cat << EXEC_CMD >> /etc/init/etcd.conf
|
||||||
exec /usr/bin/etcd -proxy on \\
|
exec /usr/bin/etcd -proxy on \\
|
||||||
|
@ -72,7 +72,7 @@ service etcd start
|
||||||
|
|
||||||
# Run apt-get upgrade and apt-get dist-upgrade. These commands will
|
# Run apt-get upgrade and apt-get dist-upgrade. These commands will
|
||||||
# bring in Calico-specific updates to the OpenStack packages and to
|
# bring in Calico-specific updates to the OpenStack packages and to
|
||||||
# dnsmasq.
|
# dnsmasq.
|
||||||
|
|
||||||
apt-get -y upgrade
|
apt-get -y upgrade
|
||||||
apt-get -y dist-upgrade
|
apt-get -y dist-upgrade
|
||||||
|
@ -101,8 +101,8 @@ sed -i "/^\[DEFAULT\]/a\
|
||||||
interface_driver = neutron.agent.linux.interface.RoutedInterfaceDriver
|
interface_driver = neutron.agent.linux.interface.RoutedInterfaceDriver
|
||||||
" /etc/neutron/dhcp_agent.ini
|
" /etc/neutron/dhcp_agent.ini
|
||||||
|
|
||||||
# Allow BGP connections through the Fuel firewall. We do this before
|
# Allow BGP connections through the Fuel firewall. We do this before
|
||||||
# installing calico-compute, so that they will be included when the
|
# installing calico-compute, so that they will be included when the
|
||||||
# calico-compute install script does iptables-save.
|
# calico-compute install script does iptables-save.
|
||||||
iptables -I INPUT 1 -p tcp --dport 179 -j ACCEPT
|
iptables -I INPUT 1 -p tcp --dport 179 -j ACCEPT
|
||||||
|
|
||||||
|
@ -137,7 +137,7 @@ apt-get -y install calico-compute bird
|
||||||
# a route reflector to avoid the need for a full BGP mesh. To this
|
# a route reflector to avoid the need for a full BGP mesh. To this
|
||||||
# end, it includes useful configuration scripts that will prepare a
|
# end, it includes useful configuration scripts that will prepare a
|
||||||
# BIRD config file with a single peering to the route reflector. If
|
# BIRD config file with a single peering to the route reflector. If
|
||||||
# that's correct for your network, you can run the following command
|
# that's correct for your network, you can run the following command
|
||||||
# for IPv4 connectivity between compute hosts.
|
# for IPv4 connectivity between compute hosts.
|
||||||
#
|
#
|
||||||
# The calico_route_reflector.sh script will set up the required BGP
|
# The calico_route_reflector.sh script will set up the required BGP
|
||||||
|
|
|
@ -60,7 +60,7 @@ initial_cluster=${initial_cluster::-1} # remove trailing comma
|
||||||
|
|
||||||
service etcd stop
|
service etcd stop
|
||||||
rm -rf /var/lib/etcd/*
|
rm -rf /var/lib/etcd/*
|
||||||
awk '/exec \/usr\/bin\/etcd/{while(getline && $0 != ""){}}1' /etc/init/etcd.conf > tmp
|
awk 'BEGIN{p=1}/exec \/usr\/bin\/etcd/{p=0}/^\s*$/{p=1}p' /etc/init/etcd.conf > tmp
|
||||||
mv tmp /etc/init/etcd.conf
|
mv tmp /etc/init/etcd.conf
|
||||||
cat << EXEC_CMD >> /etc/init/etcd.conf
|
cat << EXEC_CMD >> /etc/init/etcd.conf
|
||||||
exec /usr/bin/etcd -name ${this_node_address} \\
|
exec /usr/bin/etcd -name ${this_node_address} \\
|
||||||
|
@ -201,7 +201,7 @@ SERVICE_NAME=calico-fuel-monitor
|
||||||
apt-get -y install python-pip
|
apt-get -y install python-pip
|
||||||
pip install pyinotify pyaml
|
pip install pyinotify pyaml
|
||||||
|
|
||||||
# During node deployment, the plugin deployment scripts are copied into
|
# During node deployment, the plugin deployment scripts are copied into
|
||||||
# /etc/fuel/plugins/<plugin_name>-<plugin_version> on the node, and this
|
# /etc/fuel/plugins/<plugin_name>-<plugin_version> on the node, and this
|
||||||
# script is run from that directory.
|
# script is run from that directory.
|
||||||
SERVICE_DIR=$(pwd)
|
SERVICE_DIR=$(pwd)
|
||||||
|
|
|
@ -13,7 +13,7 @@ initial_cluster=${initial_cluster::-1} # remove trailing comma
|
||||||
|
|
||||||
service etcd stop
|
service etcd stop
|
||||||
rm -rf /var/lib/etcd/*
|
rm -rf /var/lib/etcd/*
|
||||||
awk '/exec \/usr\/bin\/etcd/{while(getline && $0 != ""){}}1' /etc/init/etcd.conf > tmp
|
awk 'BEGIN{p=1}/exec \/usr\/bin\/etcd/{p=0}/^\s*$/{p=1}p' /etc/init/etcd.conf > tmp
|
||||||
mv tmp /etc/init/etcd.conf
|
mv tmp /etc/init/etcd.conf
|
||||||
cat << EXEC_CMD >> /etc/init/etcd.conf
|
cat << EXEC_CMD >> /etc/init/etcd.conf
|
||||||
exec /usr/bin/etcd -name ${this_node_address} \\
|
exec /usr/bin/etcd -name ${this_node_address} \\
|
||||||
|
@ -39,4 +39,3 @@ while [[ $retry_count < 5 ]]; do
|
||||||
sleep 2
|
sleep 2
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue