openstack
/
fuel-web
Code Issues Proposed changes

Get rid of glance image warning

This commit is contained in:
Dmitry Pyzhov 2013-06-04 23:51:05 +04:00
parent 19e67b8050
commit 15b785f4ab
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet/osnailyfacter/examples/site.pp
View File

@ -18,6 +18,10 @@ stage {'openstack-firewall':
require => Stage['netconfig'],
}
stage {'glance-image':
require => Stage['main'],
}
node default {
case $deployment_mode {
"singlenode": { include osnailyfacter::cluster_simple }

1
puppet/osnailyfacter/manifests/cluster_ha.pp
View File

@ -178,6 +178,7 @@ class compact_controller {
os_tenant_name => $access_hash[tenant],
os_auth_url => "http://${management_vip}:5000/v2.0/",
img_name => "TestVM",
stage => 'glance-image',
}
nova::manage::floating{$floating_hash:}
Class[glance::api] -> Class[openstack::img::cirros]

1
puppet/osnailyfacter/manifests/cluster_simple.pp
View File

@ -113,6 +113,7 @@ Exec { logoutput => true }
os_password => $access_hash[password],
os_tenant_name => $access_hash[tenant],
img_name => "TestVM",
stage => 'glance-image',
}
nova::manage::floating{$floating_hash:}
Class[osnailyfacter::network_setup] -> Class[openstack::controller]