mandersson/matrix-ops
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #3 from Gijutsu/new-upstream-cosmos

Browse source 
new upstream release of cosmos that includes ln5 fixes for https remotes
This commit is contained in:
Fredrik Thulin 2016-09-01 14:13:31 +02:00 committed by GitHub
parent c048945151 f6fe928590
commit 9167776246
6 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
addhost
View file

@ -45,7 +45,7 @@ if [ ! -d $cmd_hostname ]; then
fi fi
if [ "$cmd_do_bootstrap" = "yes" ]; then 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 ./bootstrap-cosmos.sh $cmd_fqdn $rrepo $rtag
ssh root@$cmd_hostname cosmos update ssh root@$cmd_hostname cosmos update
ssh root@$cmd_hostname cosmos apply ssh root@$cmd_hostname cosmos apply

2
global/overlay/etc/cosmos/apt/bootstrap-cosmos.sh
View file

@ -23,7 +23,7 @@ fi
set -x set -x
apt-get -y install rsync git-core wget 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 if ! test -d /var/cache/cosmos/repo; then
cosmos clone "$cmd_repo" cosmos clone "$cmd_repo"

BIN
global/overlay/etc/cosmos/apt/cosmos_1.2-2_all.deb
View file

Binary file not shown.

BIN
global/overlay/etc/cosmos/apt/cosmos_1.5-1_all.deb Normal file
View file

Binary file not shown.

BIN
global/overlay/etc/cosmos/apt/puppetlabs-release-trusty.deb Normal file
View file

Binary file not shown.

4
global/overlay/usr/local/sbin/cosmos_vm
View file

@ -63,7 +63,7 @@ ssh_authorized_keys:
runcmd: runcmd:
- ["mkdir","/tmp/seed"] - ["mkdir","/tmp/seed"]
- ["mount","/dev/vdb","/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"]
- "cd /root && /root/bootstrap-cosmos.sh ${hostname} ${repo} ${tag}" - "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} ${user_data} ::user-data 2>/dev/null
mcopy -i ${seed} ${meta_data} ::meta-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/ mv ${seed} /var/lib/libvirt/images/
virsh pool-refresh default virsh pool-refresh default