openstack/fuel-agent
Code Issues Proposed changes

Fix cloud-init metadata re-applying on every single boot

Browse Source 
The actual reason is that cloud-init re-applies its metadata again
and again. Wiping out all the metadata from datasource resolves
the issue.

Change-Id: I0d1912da504df959e36c316ed09effaf1bcb682f
Closes-Bug: #1398207
This commit is contained in:
Alexander Gordeev 2014-12-04 20:37:06 +03:00
parent 5cddad22a7
commit f22194677d
4 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cloud-init-templates/boothook_centos.jinja2
View File

@ -24,7 +24,8 @@ cloud-init-per instance udev_persistent_net1 service network stop
DEFAULT_GW={{ common.master_ip }}
ADMIN_MAC={{ common.admin_mac }}
ADMIN_IF=$(echo {{ common.udevrules }} | sed 's/[,=]/\n/g' | grep "$ADMIN_MAC" | cut -d_ -f2 | head -1)
INSTALL_IF=$(ifconfig | grep "$ADMIN_MAC" | head -1 | cut -d' ' -f1)
#NOTE: it will be broken, once ifconfig (net-tools) 2.0 or higher version of package be used
INSTALL_IF=$(ifconfig -a | grep "$ADMIN_MAC" | head -1 | cut -d' ' -f1)
NETADDR=( $(ifconfig $INSTALL_IF | grep -oP "[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}") )
if [ ! -z "$(grep $ADMIN_IF /etc/sysconfig/network-scripts/ifcfg-$ADMIN_IF | grep dhcp)" ] ; then
echo -e "# FROM COBBLER SNIPPET\nDEVICE=$ADMIN_IF\nIPADDR=${NETADDR[0]}\nNETMASK=${NETADDR[2]}\nBOOTPROTO=none\nONBOOT=yes\nUSERCTL=no\n" > /etc/sysconfig/network-scripts/ifcfg-"$ADMIN_IF"

12
cloud-init-templates/boothook_ubuntu.jinja2
View File

@ -19,11 +19,15 @@ cloud-init-per instance udev_persistent_net1 /etc/init.d/networking stop
ADMIN_MAC={{ common.admin_mac }}
ADMIN_IF=$(echo {{ common.udevrules }} | sed 's/[,=]/\n/g' | grep "$ADMIN_MAC" | cut -d_ -f2 | head -1)
INSTALL_IF=$(ifconfig | grep "$ADMIN_MAC" | head -1 | cut -d' ' -f1)
#NOTE: it will be broken, once ifconfig (net-tools) 2.0 or higher version of package be used
INSTALL_IF=$(ifconfig -a | grep "$ADMIN_MAC" | head -1 | cut -d' ' -f1)
# Check if we do not already have static config (or interface seems unconfigured)
NETADDR=( $(ifconfig $INSTALL_IF | grep -oP "[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}") )
if [ ! -z "$(grep $ADMIN_IF /etc/network/interfaces.d/ifcfg-$ADMIN_IF | grep dhcp)" ] ; then
echo -e "auto $ADMIN_IF\niface $ADMIN_IF inet static\n\taddress ${NETADDR[0]}\n\tnetmask ${NETADDR[2]}\n\tbroadcast ${NETADDR[1]}" > /etc/network/interfaces.d/ifcfg-"$ADMIN_IF"
if [ ! -d "/etc/network/interfaces.d" ]; then
mkdir -p /etc/network/interfaces.d
echo 'source /etc/network/interfaces.d/*' > /etc/network/interfaces
fi
if [ ! -e "/etc/network/interfaces.d/ifcfg-$ADMIN_IF" ]; then
echo -e "auto $ADMIN_IF\niface $ADMIN_IF inet static\n\taddress {{ common.admin_ip }}\n\tnetmask {{ common.admin_mask }}" > /etc/network/interfaces.d/ifcfg-"$ADMIN_IF"
fi
#Add static udev rules
cloud-init-per instance udev_persistent_net2 echo {{ common.udevrules }} | tr ' ' '\n' | grep udevrules | tr '[:upper:]' '[:lower:]' | sed -e 's/udevrules=//g' -e 's/,/\n/g' | sed -e "s/^/SUBSYSTEM==\"net\",\ ACTION==\"add\",\ DRIVERS==\"?*\",\ ATTR{address}==\"/g" -e "s/_/\",\ ATTR{type}==\"1\",\ KERNEL==\"eth*\",\ NAME=\"/g" -e "s/$/\"/g" | tee /etc/udev/rules.d/70-persistent-net.rules

16
cloud-init-templates/meta-data_centos.jinja2
View File

@ -1,11 +1,11 @@
# instance-id will be autogenerated
# instance-id: iid-abcdefg
network-interfaces: |
auto {{ common.admin_iface_name|default("eth0") }}
iface {{ common.admin_iface_name|default("eth0") }} inet static
address {{ common.admin_ip }}
# network 192.168.1.0
netmask {{ common.admin_mask }}
# broadcast 192.168.1.255
# gateway 192.168.1.254
#network-interfaces: |
# auto {{ common.admin_iface_name|default("eth0") }}
# iface {{ common.admin_iface_name|default("eth0") }} inet static
# address {{ common.admin_ip }}
# # network 192.168.1.0
# netmask {{ common.admin_mask }}
# # broadcast 192.168.1.255
# # gateway 192.168.1.254
hostname: {{ common.hostname }}

16
cloud-init-templates/meta-data_ubuntu.jinja2
View File

@ -1,11 +1,11 @@
# instance-id will be autogenerated
# instance-id: iid-abcdefg
network-interfaces: |
auto {{ common.admin_iface_name|default("eth0") }}
iface {{ common.admin_iface_name|default("eth0") }} inet static
address {{ common.admin_ip }}
# network 192.168.1.0
netmask {{ common.admin_mask }}
# broadcast 192.168.1.255
# gateway 192.168.1.254
#network-interfaces: |
# auto {{ common.admin_iface_name|default("eth0") }}
# iface {{ common.admin_iface_name|default("eth0") }} inet static
# address {{ common.admin_ip }}
# # network 192.168.1.0
# netmask {{ common.admin_mask }}
# # broadcast 192.168.1.255
# # gateway 192.168.1.254
hostname: {{ common.hostname }}