From d9c2154d906886121e0a4e07f663cd48459228f3 Mon Sep 17 00:00:00 2001
From: Ricardo Carrillo Cruz <ricardo.carrillo.cruz@gmail.com>
Date: Wed, 24 Aug 2016 21:41:40 +0200
Subject: [PATCH] Remove initial resources creation from infracloud controller
 manifest

We are standardizing resources creation with the Ansible cloud launcher
role, thus this is not needed and caused duplicate resources.

Change-Id: I989dade7a76ed3de5829161c0cae4f699fb8de76
---
 .../manifests/infracloud/controller.pp        | 49 -------------------
 1 file changed, 49 deletions(-)

diff --git a/modules/openstack_project/manifests/infracloud/controller.pp b/modules/openstack_project/manifests/infracloud/controller.pp
index d95ed3e243..df7e879dbd 100644
--- a/modules/openstack_project/manifests/infracloud/controller.pp
+++ b/modules/openstack_project/manifests/infracloud/controller.pp
@@ -47,55 +47,6 @@ class openstack_project::infracloud::controller (
     neutron_subnet_allocation_pools  => $neutron_subnet_allocation_pools,
   }
 
-  keystone_domain { 'infra':
-    ensure  => present,
-    enabled => true,
-  }
-
-  keystone_tenant { 'openstackci':
-    ensure      => present,
-    enabled     => true,
-    description => 'Infra Long Lived Resources',
-    domain      => 'infra',
-    require     => Keystone_domain['infra'],
-  }
-
-  keystone_tenant { 'openstackjenkins':
-    ensure      => present,
-    enabled     => true,
-    description => 'Infra short lived resources',
-    domain      => 'infra',
-    require     => Keystone_domain['infra'],
-  }
-
-  keystone_user { 'openstackci':
-    ensure   => present,
-    enabled  => true,
-    domain   => 'infra',
-    email    => $openstackci_email,
-    password => $openstackci_password,
-    require  => Keystone_tenant['openstackci'],
-  }
-
-  keystone_user { 'openstackjenkins':
-    ensure   => present,
-    enabled  => true,
-    domain   => 'infra',
-    email    => $openstackjenkins_email,
-    password => $openstackjenkins_password,
-    require  => Keystone_tenant['openstackjenkins'],
-  }
-
-  keystone_role { 'user': ensure => present }
-
-  keystone_user_role { 'openstackci::infra@openstackci::infra':
-    roles => 'user',
-  }
-
-  keystone_user_role { 'openstackjenkins::infra@openstackjenkins::infra':
-    roles => 'user',
-  }
-
   realize (
     User::Virtual::Localuser['colleen'],
     User::Virtual::Localuser['rcarrillocruz'],