opendev/system-config
Code Issues Proposed changes

Merge "Add admin users"

Browse Source
This commit is contained in:
Jenkins 2015-04-10 22:27:44 +00:00 committed by Gerrit Code Review
commit 81d0ead6cd
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -741,6 +741,7 @@ node 'ask.openstack.org' {
node 'translate-dev.openstack.org' { node 'translate-dev.openstack.org' {
class { 'openstack_project::translate_dev': class { 'openstack_project::translate_dev':
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
admin_users => 'lyz,stephane',
openid_url => 'https://openstackid-dev.openstack.org', openid_url => 'https://openstackid-dev.openstack.org',
listeners => ['ajp'], listeners => ['ajp'],
mysql_host => hiera('translate_dev_mysql_host', 'localhost'), mysql_host => hiera('translate_dev_mysql_host', 'localhost'),

2
modules/openstack_project/manifests/translate_dev.pp
View File

@ -19,6 +19,7 @@ class openstack_project::translate_dev(
$mysql_port = '3306', $mysql_port = '3306',
$mysql_user = 'zanata', $mysql_user = 'zanata',
$mysql_password, $mysql_password,
$admin_users = '',
$sysadmins = [], $sysadmins = [],
$openid_url = '', $openid_url = '',
$vhost_name = $::fqdn, $vhost_name = $::fqdn,
@ -43,6 +44,7 @@ class openstack_project::translate_dev(
zanata_db_password => $mysql_password, zanata_db_password => $mysql_password,
zanata_openid_provider_url => $openid_url, zanata_openid_provider_url => $openid_url,
zanata_listeners => $listeners, zanata_listeners => $listeners,
zanata_admin_users => $admin_users,
require => [ require => [
Class['openstack_project::server'] Class['openstack_project::server']
], ],