diff --git a/.gitmodules b/.gitmodules index e0c9d14..9c07e0f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = git://github.com/puppetlabs/puppet-apt.git [submodule "modules/mysql"] path = modules/mysql - url = git://github.com/puppetlabs/puppetlabs-mysql.git + url = git://github.com/bodepd/puppetlabs-mysql.git [submodule "modules/rabbitmq"] path = modules/rabbitmq url = git://github.com/puppetlabs/puppetlabs-rabbitmq.git diff --git a/ext/glance.sh b/ext/glance.sh deleted file mode 100755 index b315a81..0000000 --- a/ext/glance.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# Extract creds -# Add images to glance and index -glance add name=ramdisk disk_format=ari container_format=ari is_public=True < /vagrant/images/lucid_ami/initrd.img-2.6.32-23-server -glance add name=kernel disk_format=aki container_format=aki is_public=True < /vagrant/images/lucid_ami/vmlinuz-2.6.32-23-server -glance add name=lucid_ami disk_format=ami container_format=ami is_public=True ramdisk_id=1 kernel_id=2 < /vagrant/images/lucid_ami/ubuntu-lucid.img -glance index diff --git a/ext/nova.sh b/ext/nova.sh deleted file mode 100755 index c69aecc..0000000 --- a/ext/nova.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# Extract creds -cd ~ -sudo nova-manage project zipfile nova novaadmin -unzip nova.zip -source novarc -euca-add-keypair openstack > ~/cert.pem -# List -nova flavor-list -nova image-list - -# Run instance -euca-run-instances ami-00000003 -k openstack -t m1.tiny -euca-describe-instances - -echo 'log into your controller VM' -echo 'check the status of your VM with euca-describe-instances' -echo 'when it is in the running state, verify that you can login' -echo 'using ssh -i ~/cert.pem root@ip.address' diff --git a/modules/glance b/modules/glance index cfc9516..a84a072 160000 --- a/modules/glance +++ b/modules/glance @@ -1 +1 @@ -Subproject commit cfc951664aa2fdd1ae5850224e644fcc8c99a7a3 +Subproject commit a84a072a0e27d96e3a7eeb43413386984b581e53 diff --git a/modules/keystone b/modules/keystone index fa7e3a8..ff3e37c 160000 --- a/modules/keystone +++ b/modules/keystone @@ -1 +1 @@ -Subproject commit fa7e3a87fce17719b7cb07f42fee613456f2feae +Subproject commit ff3e37c9f47122dd26b6c8e72c879126ca8251a4 diff --git a/modules/rabbitmq b/modules/rabbitmq index a12915d..57fe777 160000 --- a/modules/rabbitmq +++ b/modules/rabbitmq @@ -1 +1 @@ -Subproject commit a12915dd4a6bb91294246040c0f2e12215974548 +Subproject commit 57fe77731b5bc09c1dbd8410e40d8324f0142897 diff --git a/modules/stdlib b/modules/stdlib index a0e27cd..b9a3385 160000 --- a/modules/stdlib +++ b/modules/stdlib @@ -1 +1 @@ -Subproject commit a0e27cd5a3bfd2fe55c9be64a435e93853815667 +Subproject commit b9a33851d22d1530e018c74fc802fcb99a930268 diff --git a/modules/swift b/modules/swift index f802df8..0a5a91b 160000 --- a/modules/swift +++ b/modules/swift @@ -1 +1 @@ -Subproject commit f802df8e5aea46685ba5d7a97b7b31f18aafeae7 +Subproject commit 0a5a91bb683a1e679bb21a65171761976db62745