opendev/system-config
Code Issues Proposed changes

Merge "Create openstackjenkins and openstackci users on infracloud"

Browse Source
This commit is contained in:
Jenkins 2016-02-25 16:20:39 +00:00 committed by Gerrit Code Review
commit a3620649c2
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -1185,6 +1185,8 @@ node 'controller00.hpuswest.ic.openstack.org' {
br_name => 'br-vlan25', br_name => 'br-vlan25',
controller_management_address => '10.10.16.146', controller_management_address => '10.10.16.146',
controller_public_address => $::fqdn, controller_public_address => $::fqdn,
openstackci_password => hiera('openstackci_infracloud_password'),
openstackjenkins_password => hiera('openstackjenkins_infracloud_password'),
} }
} }

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

@ -17,6 +17,10 @@ class openstack_project::infracloud::controller (
$br_name, $br_name,
$controller_management_address, $controller_management_address,
$controller_public_address = $::fqdn, $controller_public_address = $::fqdn,
$openstackci_password,
$openstackci_email = 'infra-root@openstack.org',
$openstackjenkins_password,
$openstackjenkins_email = 'infra-root@openstack.org',
) { ) {
class { '::infracloud::controller': class { '::infracloud::controller':
keystone_rabbit_password => $keystone_rabbit_password, keystone_rabbit_password => $keystone_rabbit_password,
@ -59,4 +63,22 @@ class openstack_project::infracloud::controller (
domain => 'infra', domain => 'infra',
require => Keystone_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'],
}
} }