From c8441ddd96a25e80f3cab87f0650ded839b9a76d Mon Sep 17 00:00:00 2001
From: Cody Herriges <cody@herriges.org>
Date: Mon, 28 Mar 2016 08:20:22 -0700
Subject: [PATCH] Add explicit dependencies to pass puppet4

  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
---
 manifests/provision.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manifests/provision.pp b/manifests/provision.pp
index 720d66bb1..b1a963995 100644
--- a/manifests/provision.pp
+++ b/manifests/provision.pp
@@ -13,6 +13,7 @@ class openstack_integration::provision {
     unless   => "nova ${os_auth_options} flavor-list | grep m1.nano",
   }
   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':
     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",
   }
   Keystone_user_role['admin@openstack'] -> Exec['manage_m1.micro_nova_flavor']
+  Class['::nova::keystone::auth'] -> Exec['manage_m1.micro_nova_flavor']
 
   neutron_network { 'public':
     tenant_name               => 'openstack',