opendev/system-config
Code Issues Proposed changes

Remove initial resources creation from infracloud controller manifest

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

Change-Id: I989dade7a76ed3de5829161c0cae4f699fb8de76
This commit is contained in:
Ricardo Carrillo Cruz 2016-08-24 21:41:40 +02:00
parent 44de9a04eb
commit d9c2154d90
1 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
modules/openstack_project/manifests/infracloud/controller.pp
View File

@ -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'],