Update apt/ from nunoc-ops.ct-ops-2017-07-28-v03

5 files changed, 10 insertions, 5 deletions

diff --git a/global/overlay/etc/cosmos/apt/bootstrap-cosmos.sh b/global/overlay/etc/cosmos/apt/bootstrap-cosmos.sh
index 28cbde0..1534dc5 100755
--- a/global/overlay/etc/cosmos/apt/bootstrap-cosmos.sh
+++ b/global/overlay/etc/cosmos/apt/bootstrap-cosmos.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-set -e
+#set -e 
+# not all breakage is un-recoverable...
 
 cmd_hostname="$1"
 if test -z "$cmd_hostname"; then
@@ -20,16 +21,20 @@ if test -z "$cmd_tags"; then
    exit 3
 fi
 
-set -x
-
-apt-get -y install rsync git-core wget
-dpkg -i cosmos_1.2-2_all.deb
+apt-get -y update
+apt-get -y upgrade
+for pkg in rsync git git-core wget; do
+   apt-get -y install $pkg
+done
+dpkg -i cosmos_1.5-1_all.deb
 
 if ! test -d /var/cache/cosmos/repo; then
     cosmos clone "$cmd_repo"
 fi
 
 hostname $cmd_hostname
+short=`echo ${cmd_hostname} | awk -F. '{print $1}'`
+echo "127.0.1.1 ${cmd_hostname} ${short}" >> /etc/hosts
 
 perl -pi -e "s,#COSMOS_REPO_MODELS=.*,COSMOS_REPO_MODELS=\"\\\$COSMOS_REPO/global/:\\\$COSMOS_REPO/$cmd_hostname/\"," /etc/cosmos/cosmos.conf
 perl -pi -e "s,#COSMOS_UPDATE_VERIFY_GIT_TAG_PATTERN=.*,COSMOS_UPDATE_VERIFY_GIT_TAG_PATTERN=\"${cmd_tags}*\"," /etc/cosmos/cosmos.conf
diff --git a/global/overlay/etc/cosmos/apt/cosmos_1.2-2_all.deb b/global/overlay/etc/cosmos/apt/cosmos_1.2-2_all.deb
deleted file mode 100644
index 9fe4434..0000000
--- a/global/overlay/etc/cosmos/apt/cosmos_1.2-2_all.deb
+++ /dev/null
diff --git a/global/overlay/etc/cosmos/apt/cosmos_1.5-1_all.deb b/global/overlay/etc/cosmos/apt/cosmos_1.5-1_all.deb
new file mode 100644
index 0000000..28cdaad
--- /dev/null
+++ b/global/overlay/etc/cosmos/apt/cosmos_1.5-1_all.deb
diff --git a/global/overlay/etc/cosmos/apt/puppetlabs-release-trusty.deb b/global/overlay/etc/cosmos/apt/puppetlabs-release-trusty.deb
new file mode 100644
index 0000000..2d924af
--- /dev/null
+++ b/global/overlay/etc/cosmos/apt/puppetlabs-release-trusty.deb
diff --git a/global/overlay/etc/cosmos/apt/puppetlabs-release-xenial.deb b/global/overlay/etc/cosmos/apt/puppetlabs-release-xenial.deb
new file mode 100644
index 0000000..ca14b25
--- /dev/null
+++ b/global/overlay/etc/cosmos/apt/puppetlabs-release-xenial.deb