opendev/system-config
Code Issues Proposed changes

Merge "Move afs client to openstack_project::server"

Browse Source
This commit is contained in:
Jenkins 2017-04-26 04:45:07 +00:00 committed by Gerrit Code Review
commit 9730f60382
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/openstack_project/manifests/server.pp
View File

@ -186,6 +186,19 @@ class openstack_project::server (
} }
} }
if $afs {
class { 'openafs::client':
cell => 'openstack.org',
realm => 'OPENSTACK.ORG',
admin_server => 'kdc.openstack.org',
cache_size => $afs_cache_size,
kdcs => [
'kdc01.openstack.org',
'kdc02.openstack.org',
],
}
}
class { 'openstack_project::automatic_upgrades': class { 'openstack_project::automatic_upgrades':
origins => ["Puppetlabs:${lsbdistcodename}"], origins => ["Puppetlabs:${lsbdistcodename}"],
} }
@ -269,7 +282,6 @@ class openstack_project::server (
ca_server => $ca_server, ca_server => $ca_server,
puppetmaster_server => $puppetmaster_server, puppetmaster_server => $puppetmaster_server,
afs => $afs, afs => $afs,
afs_cache_size => $afs_cache_size,
sysadmins => $sysadmins, sysadmins => $sysadmins,
} }

12
modules/openstack_project/manifests/template.pp
View File

@ -14,7 +14,6 @@ class openstack_project::template (
$certname = $::fqdn, $certname = $::fqdn,
$ca_server = undef, $ca_server = undef,
$afs = false, $afs = false,
$afs_cache_size = 500000,
$puppetmaster_server = 'puppetmaster.openstack.org', $puppetmaster_server = 'puppetmaster.openstack.org',
$sysadmins = [], $sysadmins = [],
$permit_root_login = 'no', $permit_root_login = 'no',
@ -26,17 +25,6 @@ class openstack_project::template (
if ( $afs ) { if ( $afs ) {
$all_udp = concat( $all_udp = concat(
$iptables_public_udp_ports, [7001]) $iptables_public_udp_ports, [7001])
class { 'openafs::client':
cell => 'openstack.org',
realm => 'OPENSTACK.ORG',
admin_server => 'kdc.openstack.org',
cache_size => $afs_cache_size,
kdcs => [
'kdc01.openstack.org',
'kdc02.openstack.org',
],
}
} else { } else {
$all_udp = $iptables_public_udp_ports $all_udp = $iptables_public_udp_ports
} }