From 6b183c779a73d75b2a7b3567ffa0753c48f232c9 Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Wed, 2 Sep 2015 07:31:43 -0700 Subject: [PATCH 1/1] Updated system_reseal script After all the work on getting Ubuntu systems working correctly with the lf-networking Vagrant defintion, this is the finalized system_reseal script that needs to be used by all configurations. It will likely correct some issues we may not even have realized we had. Change-Id: Ie7804b71b8caa4a8fdbd0d78292feb1f8ef19d7b Signed-off-by: Andrew Grimberg --- vagrant/baseline/system_reseal.sh | 15 ++++++++++ vagrant/basic-builder/system_reseal.sh | 29 +++++++++++++++++++ vagrant/basic-java-node/system_reseal.sh | 29 +++++++++++++++++++ .../system_reseal.sh | 29 +++++++++++++++++++ vagrant/basic-mininet-node/system_reseal.sh | 29 +++++++++++++++++++ .../system_reseal.sh | 29 +++++++++++++++++++ vagrant/ovsdb-devstack/system_reseal.sh | 29 +++++++++++++++++++ vagrant/ovsdb-docker/system_reseal.sh | 29 +++++++++++++++++++ 8 files changed, 218 insertions(+) diff --git a/vagrant/baseline/system_reseal.sh b/vagrant/baseline/system_reseal.sh index 0b2fb8d44d..07a0531777 100644 --- a/vagrant/baseline/system_reseal.sh +++ b/vagrant/baseline/system_reseal.sh @@ -21,6 +21,21 @@ rm -rf ~/.viminfo /etc/ssh/ssh*key* # kill any cloud-init related bits rm -rf /var/lib/cloud/* +if [ -e /usr/bin/facter ] +then + if [ `/usr/bin/facter operatingsystem` = 'Ubuntu' ] + then + rm -rf /etc/hostname* /etc/hosts /etc/network/interfaces /etc/network/interfaces.*.bak~ + cat <> /etc/network/interfaces +# Used by ifup(8) and ifdown(8). See the interfaces(5) manpage or +# /usr/share/doc/ifupdown/examples for more information. +# The loopback network interface +auto lo +iface lo inet loopback +EOINT + fi +fi + echo "********************************************" echo "* PLEASE SNAPSHOT IMAGE AT THIS TIME *" echo "********************************************" diff --git a/vagrant/basic-builder/system_reseal.sh b/vagrant/basic-builder/system_reseal.sh index ba54ce2f19..07a0531777 100644 --- a/vagrant/basic-builder/system_reseal.sh +++ b/vagrant/basic-builder/system_reseal.sh @@ -1,5 +1,16 @@ #!/bin/bash +# vim: sw=2 ts=2 sts=2 et : + +if [ -f /.autorelabel ]; then + echo "**********************************************" + echo "* SYSTEM REQUIRES RELABELING SKIPPING RESEAL *" + echo "* PLEASE RESTART SYSTEM AND RERUN *" + echo "* PROVISIONING SCRIPTS *" + echo "**********************************************" + exit 1; +fi + # clean-up from any prior cloud-init networking rm -rf /etc/sysconfig/network-scripts/{ifcfg,route}-eth* @@ -7,6 +18,24 @@ rm -rf /etc/Pegasus/*.cnf /etc/Pegasus/*.crt /etc/Pegasus/*.csr /etc/Pegasus/*.p rm -rf ~/.viminfo /etc/ssh/ssh*key* +# kill any cloud-init related bits +rm -rf /var/lib/cloud/* + +if [ -e /usr/bin/facter ] +then + if [ `/usr/bin/facter operatingsystem` = 'Ubuntu' ] + then + rm -rf /etc/hostname* /etc/hosts /etc/network/interfaces /etc/network/interfaces.*.bak~ + cat <> /etc/network/interfaces +# Used by ifup(8) and ifdown(8). See the interfaces(5) manpage or +# /usr/share/doc/ifupdown/examples for more information. +# The loopback network interface +auto lo +iface lo inet loopback +EOINT + fi +fi + echo "********************************************" echo "* PLEASE SNAPSHOT IMAGE AT THIS TIME *" echo "********************************************" diff --git a/vagrant/basic-java-node/system_reseal.sh b/vagrant/basic-java-node/system_reseal.sh index ba54ce2f19..07a0531777 100644 --- a/vagrant/basic-java-node/system_reseal.sh +++ b/vagrant/basic-java-node/system_reseal.sh @@ -1,5 +1,16 @@ #!/bin/bash +# vim: sw=2 ts=2 sts=2 et : + +if [ -f /.autorelabel ]; then + echo "**********************************************" + echo "* SYSTEM REQUIRES RELABELING SKIPPING RESEAL *" + echo "* PLEASE RESTART SYSTEM AND RERUN *" + echo "* PROVISIONING SCRIPTS *" + echo "**********************************************" + exit 1; +fi + # clean-up from any prior cloud-init networking rm -rf /etc/sysconfig/network-scripts/{ifcfg,route}-eth* @@ -7,6 +18,24 @@ rm -rf /etc/Pegasus/*.cnf /etc/Pegasus/*.crt /etc/Pegasus/*.csr /etc/Pegasus/*.p rm -rf ~/.viminfo /etc/ssh/ssh*key* +# kill any cloud-init related bits +rm -rf /var/lib/cloud/* + +if [ -e /usr/bin/facter ] +then + if [ `/usr/bin/facter operatingsystem` = 'Ubuntu' ] + then + rm -rf /etc/hostname* /etc/hosts /etc/network/interfaces /etc/network/interfaces.*.bak~ + cat <> /etc/network/interfaces +# Used by ifup(8) and ifdown(8). See the interfaces(5) manpage or +# /usr/share/doc/ifupdown/examples for more information. +# The loopback network interface +auto lo +iface lo inet loopback +EOINT + fi +fi + echo "********************************************" echo "* PLEASE SNAPSHOT IMAGE AT THIS TIME *" echo "********************************************" diff --git a/vagrant/basic-mininet-fedora-node/system_reseal.sh b/vagrant/basic-mininet-fedora-node/system_reseal.sh index ba54ce2f19..07a0531777 100644 --- a/vagrant/basic-mininet-fedora-node/system_reseal.sh +++ b/vagrant/basic-mininet-fedora-node/system_reseal.sh @@ -1,5 +1,16 @@ #!/bin/bash +# vim: sw=2 ts=2 sts=2 et : + +if [ -f /.autorelabel ]; then + echo "**********************************************" + echo "* SYSTEM REQUIRES RELABELING SKIPPING RESEAL *" + echo "* PLEASE RESTART SYSTEM AND RERUN *" + echo "* PROVISIONING SCRIPTS *" + echo "**********************************************" + exit 1; +fi + # clean-up from any prior cloud-init networking rm -rf /etc/sysconfig/network-scripts/{ifcfg,route}-eth* @@ -7,6 +18,24 @@ rm -rf /etc/Pegasus/*.cnf /etc/Pegasus/*.crt /etc/Pegasus/*.csr /etc/Pegasus/*.p rm -rf ~/.viminfo /etc/ssh/ssh*key* +# kill any cloud-init related bits +rm -rf /var/lib/cloud/* + +if [ -e /usr/bin/facter ] +then + if [ `/usr/bin/facter operatingsystem` = 'Ubuntu' ] + then + rm -rf /etc/hostname* /etc/hosts /etc/network/interfaces /etc/network/interfaces.*.bak~ + cat <> /etc/network/interfaces +# Used by ifup(8) and ifdown(8). See the interfaces(5) manpage or +# /usr/share/doc/ifupdown/examples for more information. +# The loopback network interface +auto lo +iface lo inet loopback +EOINT + fi +fi + echo "********************************************" echo "* PLEASE SNAPSHOT IMAGE AT THIS TIME *" echo "********************************************" diff --git a/vagrant/basic-mininet-node/system_reseal.sh b/vagrant/basic-mininet-node/system_reseal.sh index ba54ce2f19..07a0531777 100644 --- a/vagrant/basic-mininet-node/system_reseal.sh +++ b/vagrant/basic-mininet-node/system_reseal.sh @@ -1,5 +1,16 @@ #!/bin/bash +# vim: sw=2 ts=2 sts=2 et : + +if [ -f /.autorelabel ]; then + echo "**********************************************" + echo "* SYSTEM REQUIRES RELABELING SKIPPING RESEAL *" + echo "* PLEASE RESTART SYSTEM AND RERUN *" + echo "* PROVISIONING SCRIPTS *" + echo "**********************************************" + exit 1; +fi + # clean-up from any prior cloud-init networking rm -rf /etc/sysconfig/network-scripts/{ifcfg,route}-eth* @@ -7,6 +18,24 @@ rm -rf /etc/Pegasus/*.cnf /etc/Pegasus/*.crt /etc/Pegasus/*.csr /etc/Pegasus/*.p rm -rf ~/.viminfo /etc/ssh/ssh*key* +# kill any cloud-init related bits +rm -rf /var/lib/cloud/* + +if [ -e /usr/bin/facter ] +then + if [ `/usr/bin/facter operatingsystem` = 'Ubuntu' ] + then + rm -rf /etc/hostname* /etc/hosts /etc/network/interfaces /etc/network/interfaces.*.bak~ + cat <> /etc/network/interfaces +# Used by ifup(8) and ifdown(8). See the interfaces(5) manpage or +# /usr/share/doc/ifupdown/examples for more information. +# The loopback network interface +auto lo +iface lo inet loopback +EOINT + fi +fi + echo "********************************************" echo "* PLEASE SNAPSHOT IMAGE AT THIS TIME *" echo "********************************************" diff --git a/vagrant/integration-robotframework/system_reseal.sh b/vagrant/integration-robotframework/system_reseal.sh index ba54ce2f19..07a0531777 100644 --- a/vagrant/integration-robotframework/system_reseal.sh +++ b/vagrant/integration-robotframework/system_reseal.sh @@ -1,5 +1,16 @@ #!/bin/bash +# vim: sw=2 ts=2 sts=2 et : + +if [ -f /.autorelabel ]; then + echo "**********************************************" + echo "* SYSTEM REQUIRES RELABELING SKIPPING RESEAL *" + echo "* PLEASE RESTART SYSTEM AND RERUN *" + echo "* PROVISIONING SCRIPTS *" + echo "**********************************************" + exit 1; +fi + # clean-up from any prior cloud-init networking rm -rf /etc/sysconfig/network-scripts/{ifcfg,route}-eth* @@ -7,6 +18,24 @@ rm -rf /etc/Pegasus/*.cnf /etc/Pegasus/*.crt /etc/Pegasus/*.csr /etc/Pegasus/*.p rm -rf ~/.viminfo /etc/ssh/ssh*key* +# kill any cloud-init related bits +rm -rf /var/lib/cloud/* + +if [ -e /usr/bin/facter ] +then + if [ `/usr/bin/facter operatingsystem` = 'Ubuntu' ] + then + rm -rf /etc/hostname* /etc/hosts /etc/network/interfaces /etc/network/interfaces.*.bak~ + cat <> /etc/network/interfaces +# Used by ifup(8) and ifdown(8). See the interfaces(5) manpage or +# /usr/share/doc/ifupdown/examples for more information. +# The loopback network interface +auto lo +iface lo inet loopback +EOINT + fi +fi + echo "********************************************" echo "* PLEASE SNAPSHOT IMAGE AT THIS TIME *" echo "********************************************" diff --git a/vagrant/ovsdb-devstack/system_reseal.sh b/vagrant/ovsdb-devstack/system_reseal.sh index ba54ce2f19..07a0531777 100644 --- a/vagrant/ovsdb-devstack/system_reseal.sh +++ b/vagrant/ovsdb-devstack/system_reseal.sh @@ -1,5 +1,16 @@ #!/bin/bash +# vim: sw=2 ts=2 sts=2 et : + +if [ -f /.autorelabel ]; then + echo "**********************************************" + echo "* SYSTEM REQUIRES RELABELING SKIPPING RESEAL *" + echo "* PLEASE RESTART SYSTEM AND RERUN *" + echo "* PROVISIONING SCRIPTS *" + echo "**********************************************" + exit 1; +fi + # clean-up from any prior cloud-init networking rm -rf /etc/sysconfig/network-scripts/{ifcfg,route}-eth* @@ -7,6 +18,24 @@ rm -rf /etc/Pegasus/*.cnf /etc/Pegasus/*.crt /etc/Pegasus/*.csr /etc/Pegasus/*.p rm -rf ~/.viminfo /etc/ssh/ssh*key* +# kill any cloud-init related bits +rm -rf /var/lib/cloud/* + +if [ -e /usr/bin/facter ] +then + if [ `/usr/bin/facter operatingsystem` = 'Ubuntu' ] + then + rm -rf /etc/hostname* /etc/hosts /etc/network/interfaces /etc/network/interfaces.*.bak~ + cat <> /etc/network/interfaces +# Used by ifup(8) and ifdown(8). See the interfaces(5) manpage or +# /usr/share/doc/ifupdown/examples for more information. +# The loopback network interface +auto lo +iface lo inet loopback +EOINT + fi +fi + echo "********************************************" echo "* PLEASE SNAPSHOT IMAGE AT THIS TIME *" echo "********************************************" diff --git a/vagrant/ovsdb-docker/system_reseal.sh b/vagrant/ovsdb-docker/system_reseal.sh index ba54ce2f19..07a0531777 100644 --- a/vagrant/ovsdb-docker/system_reseal.sh +++ b/vagrant/ovsdb-docker/system_reseal.sh @@ -1,5 +1,16 @@ #!/bin/bash +# vim: sw=2 ts=2 sts=2 et : + +if [ -f /.autorelabel ]; then + echo "**********************************************" + echo "* SYSTEM REQUIRES RELABELING SKIPPING RESEAL *" + echo "* PLEASE RESTART SYSTEM AND RERUN *" + echo "* PROVISIONING SCRIPTS *" + echo "**********************************************" + exit 1; +fi + # clean-up from any prior cloud-init networking rm -rf /etc/sysconfig/network-scripts/{ifcfg,route}-eth* @@ -7,6 +18,24 @@ rm -rf /etc/Pegasus/*.cnf /etc/Pegasus/*.crt /etc/Pegasus/*.csr /etc/Pegasus/*.p rm -rf ~/.viminfo /etc/ssh/ssh*key* +# kill any cloud-init related bits +rm -rf /var/lib/cloud/* + +if [ -e /usr/bin/facter ] +then + if [ `/usr/bin/facter operatingsystem` = 'Ubuntu' ] + then + rm -rf /etc/hostname* /etc/hosts /etc/network/interfaces /etc/network/interfaces.*.bak~ + cat <> /etc/network/interfaces +# Used by ifup(8) and ifdown(8). See the interfaces(5) manpage or +# /usr/share/doc/ifupdown/examples for more information. +# The loopback network interface +auto lo +iface lo inet loopback +EOINT + fi +fi + echo "********************************************" echo "* PLEASE SNAPSHOT IMAGE AT THIS TIME *" echo "********************************************" -- 2.36.6