stackforge/puppet-openstack
Code Issues Proposed changes

reversed nova_test.sh updates, fixed misspelling in controller.pp; added parameters needed to enable additional horizon services

Browse Source
This commit is contained in:
Robert Starmer
2012-06-12 22:25:26 +00:00
parent e6c3608480
commit fba5fdf45e
2 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
files/nova_test.sh
View File

@@ -5,32 +5,26 @@
source /root/openrc source /root/openrc
# get an image to test with # get an image to test with
#wget http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img #wget http://uec-images.ubuntu.com/releases/11.10/release/ubuntu-11.10-server-cloudimg-amd64-disk1.img
# import that image into glance
#glance add name="precise-amd64" is_public=true container_format=ovf disk_format=qcow2 < precise-server-cloudimg-amd64-disk1.img # import that image into glance
#IMAGE_ID=`glance index | grep 'precise-amd64' | head -1 | awk -F' ' '{print $1}'` #glance add name="Ubuntu 11.10 cloudimg amd64" is_public=true container_format=ovf disk_format=qcow2 < ubuntu-11.10-server-cloudimg-amd64-disk1.img
#IMAGE_ID=`glance index | grep 'Ubuntu 11.10 cloudimg amd64' | head -1 | awk -F' ' '{print $1}'`
wget https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-i386-disk.img
glance add name='cirros image' is_public=true container_format=bare disk_format=qcow2 < cirros-0.3.0-i386-disk.img
wget https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img
glance add name='cirros image' is_public=true container_format=bare disk_format=qcow2 < cirros-0.3.0-x86_64-disk.img
IMAGE_ID=`glance index | grep 'cirros image' | head -1 | awk -F' ' '{print $1}'` IMAGE_ID=`glance index | grep 'cirros image' | head -1 | awk -F' ' '{print $1}'`
# create a pub key # create a pub key
ssh-keygen -f /tmp/id_rsa -t rsa -N '' ssh-keygen -f /tmp/id_rsa -t rsa -N ''
nova keypair-add --pub_key /tmp/id_rsa.pub key_cirros nova keypair-add --pub_key /tmp/id_rsa.pub key1
nova secgroup-create cirros_test 'Cirros test security group' nova boot --flavor 1 --image ${IMAGE_ID} --key_name key1 dans_vm
nova secgroup-add-rule cirros_test tcp 22 22 0.0.0.0/0
nova secgroup-add-rule cirros_test tcp 80 80 0.0.0.0/0
nova secgroup-add-rule cirros_test icmp -1 -1 0.0.0.0/0
floating_ip=`nova floating-ip-create | grep None | awk '{print $2}'` nova show dans_vm
nova boot --flavor 1 --security_groups cirros_test --image ${IMAGE_ID} --key_name key_cirros cirros_vm
sleep 5
nova show cirros_vm
# wait for the server to boot
sleep 20
nova add-floating-ip precise_vm $floating_ip
sleep 10
ssh ubuntu@$floating_ip -i /tmp/id_rsa
# create ec2 credentials
keystone ec2-credentials-create

2
manifests/controller.pp
View File

@@ -34,7 +34,7 @@
# [cache_server_ip] local memcached instance ip # [cache_server_ip] local memcached instance ip
# [cache_server_port] local memcached instance port # [cache_server_port] local memcached instance port
# [swift] (bool) is swift installed # [swift] (bool) is swift installed
# [quantum] (bool) is quqntum installed # [quantum] (bool) is quantum installed
# The next is an array of arrays, that can be used to add call-out links to the dashboard for other apps. # The next is an array of arrays, that can be used to add call-out links to the dashboard for other apps.
# There is no specific requirement for these apps to be for monitoring, that's just the defacto purpose. # There is no specific requirement for these apps to be for monitoring, that's just the defacto purpose.
# Each app is defined in two parts, the display name, and the URI # Each app is defined in two parts, the display name, and the URI