diff --git a/addhost b/addhost index 033c16b..1c34ce3 100755 --- a/addhost +++ b/addhost @@ -45,7 +45,7 @@ if [ ! -d $cmd_hostname ]; then fi if [ "$cmd_do_bootstrap" = "yes" ]; then - scp apt/cosmos_1.2-2_all.deb apt/bootstrap-cosmos.sh root@$cmd_hostname: + scp apt/cosmos_1.5-1_all.deb apt/bootstrap-cosmos.sh root@$cmd_hostname: ssh root@$cmd_hostname ./bootstrap-cosmos.sh $cmd_fqdn $rrepo $rtag ssh root@$cmd_hostname cosmos update ssh root@$cmd_hostname cosmos apply diff --git a/global/overlay/etc/cosmos/apt/bootstrap-cosmos.sh b/global/overlay/etc/cosmos/apt/bootstrap-cosmos.sh index 28cbde0..613b74e 100755 --- a/global/overlay/etc/cosmos/apt/bootstrap-cosmos.sh +++ b/global/overlay/etc/cosmos/apt/bootstrap-cosmos.sh @@ -23,7 +23,7 @@ fi set -x apt-get -y install rsync git-core wget -dpkg -i cosmos_1.2-2_all.deb +dpkg -i cosmos_1.5-1_all.deb if ! test -d /var/cache/cosmos/repo; then cosmos clone "$cmd_repo" 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 Binary files a/global/overlay/etc/cosmos/apt/cosmos_1.2-2_all.deb and /dev/null differ 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 Binary files /dev/null and b/global/overlay/etc/cosmos/apt/cosmos_1.5-1_all.deb differ 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 Binary files /dev/null and b/global/overlay/etc/cosmos/apt/puppetlabs-release-trusty.deb differ diff --git a/global/overlay/usr/local/sbin/cosmos_vm b/global/overlay/usr/local/sbin/cosmos_vm index bf27576..ca58022 100755 --- a/global/overlay/usr/local/sbin/cosmos_vm +++ b/global/overlay/usr/local/sbin/cosmos_vm @@ -63,7 +63,7 @@ ssh_authorized_keys: runcmd: - ["mkdir","/tmp/seed"] - ["mount","/dev/vdb","/tmp/seed"] - - ["cp","/tmp/seed/bootstrap-cosmos.sh","/tmp/seed/cosmos_1.2-2_all.deb","/root"] + - ["cp","/tmp/seed/bootstrap-cosmos.sh","/tmp/seed/cosmos_1.5-1_all.deb","/root"] - ["cd","/root"] - "cd /root && /root/bootstrap-cosmos.sh ${hostname} ${repo} ${tag}" @@ -112,7 +112,7 @@ fi mcopy -i ${seed} ${user_data} ::user-data 2>/dev/null mcopy -i ${seed} ${meta_data} ::meta-data 2>/dev/null -mcopy -i ${seed} /etc/cosmos/apt/bootstrap-cosmos.sh /etc/cosmos/apt/cosmos_1.2-2_all.deb :: +mcopy -i ${seed} /etc/cosmos/apt/bootstrap-cosmos.sh /etc/cosmos/apt/cosmos_1.5-1_all.deb :: mv ${seed} /var/lib/libvirt/images/ virsh pool-refresh default