openstack
/
puppet-nova
Code Issues Proposed changes

Merge remote branch 'cblument/dev' into dev 

Conflicts:
	nova/tests/rackspace/all.pp
This commit is contained in:
Dan Bode 2011-06-01 15:47:57 -07:00
parent e5ec324448 ad9de78c8e
commit f94d70a4e1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/rackspace/all.pp
View File

@ -8,7 +8,7 @@ class { 'nova::rackspace::all':
glance_host => 'glance_ip_address',
glance_port => '9292',
allow_admin_api => 'true',
host => $ipaddress,
host => $hostname,
xenapi_connection_url => 'https://<XenServer_IP>',
xenapi_connection_username => 'root',
xenapi_connection_password => 'password',