From 6cd2e43856251b3d157e61b2a1ee731f33764a89 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 23 Feb 2016 13:16:26 -0500
Subject: [PATCH] keystone: manage admin user role before openrc

When /root/openrc is present, Puppet catalog will try to use it.
Though to use openrc, we need the admin user role in place otherwise
authentification will faill.

This patch makes sure the right orchestration happens.

Closes-Bug: #1548515
Change-Id: I99a5850e397992427719d801e8dc5f12e6f0a296
---
 manifests/keystone.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/keystone.pp b/manifests/keystone.pp
index 6b8a632e7..c4a1437b5 100644
--- a/manifests/keystone.pp
+++ b/manifests/keystone.pp
@@ -50,4 +50,5 @@ class openstack_integration::keystone (
     project_domain => 'default',
     user_domain    => 'default',
   }
+  Keystone_user_role['admin@openstack'] -> File['/root/openrc']
 }