openstack/puppet-openstack-integration
Code Issues Proposed changes

Add explicit dependencies to pass puppet4

Browse Source 
This commit will add explicit dependencies in some resources in the
  provision profile.

  Without this change the CI does not pass on Puppet 4 because of the
  change in default run order.

Depends-On: Ifc3f40ae1cb71c215b8a0bf6cd5f6d05101a6168
Change-Id: Iedfa6f78936676ba54ebb888734a3b381a2378e7
This commit is contained in:
Cody Herriges 2016-03-28 08:20:22 -07:00
parent 0681b75c39
commit c8441ddd96
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/provision.pp
View File

@ -13,6 +13,7 @@ class openstack_integration::provision {
unless => "nova ${os_auth_options} flavor-list | grep m1.nano", unless => "nova ${os_auth_options} flavor-list | grep m1.nano",
} }
Keystone_user_role['admin@openstack'] -> Exec['manage_m1.nano_nova_flavor'] Keystone_user_role['admin@openstack'] -> Exec['manage_m1.nano_nova_flavor']
Class['::nova::keystone::auth'] -> Exec['manage_m1.nano_nova_flavor']
exec { 'manage_m1.micro_nova_flavor': exec { 'manage_m1.micro_nova_flavor':
path => '/usr/bin:/bin:/usr/sbin:/sbin', path => '/usr/bin:/bin:/usr/sbin:/sbin',
@ -21,6 +22,7 @@ class openstack_integration::provision {
unless => "nova ${os_auth_options} flavor-list | grep m1.micro", unless => "nova ${os_auth_options} flavor-list | grep m1.micro",
} }
Keystone_user_role['admin@openstack'] -> Exec['manage_m1.micro_nova_flavor'] Keystone_user_role['admin@openstack'] -> Exec['manage_m1.micro_nova_flavor']
Class['::nova::keystone::auth'] -> Exec['manage_m1.micro_nova_flavor']
neutron_network { 'public': neutron_network { 'public':
tenant_name => 'openstack', tenant_name => 'openstack',