opendev/system-config
Code Issues Proposed changes

Merge "Remove users.pp and users_install.pp from single_use_slave.pp"

Browse Source
This commit is contained in:
Jenkins 2017-04-24 19:35:52 +00:00 committed by Gerrit Code Review
commit 519c930cbf
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,11 @@ class openstack_project::server (
) { ) {
include sudoers include sudoers
include openstack_project::params include openstack_project::params
include openstack_project::users
class { 'openstack_project::users_install':
install_users => true,
}
class { 'timezone': class { 'timezone':
timezone => 'Etc/UTC', timezone => 'Etc/UTC',

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

@ -5,7 +5,6 @@
# user are by default off but can be enabled. # user are by default off but can be enabled.
class openstack_project::single_use_slave ( class openstack_project::single_use_slave (
$certname = $::fqdn, $certname = $::fqdn,
$install_users = false,
$install_resolv_conf = true, $install_resolv_conf = true,
$sudo = false, $sudo = false,
$ssh_key = $openstack_project::jenkins_ssh_key, $ssh_key = $openstack_project::jenkins_ssh_key,
@ -14,7 +13,6 @@ class openstack_project::single_use_slave (
) inherits openstack_project { ) inherits openstack_project {
class { 'openstack_project::template': class { 'openstack_project::template':
certname => $certname, certname => $certname,
install_users => $install_users,
install_resolv_conf => $install_resolv_conf, install_resolv_conf => $install_resolv_conf,
iptables_rules4 => iptables_rules4 =>
[ [

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

@ -10,7 +10,6 @@ class openstack_project::template (
$snmp_v4hosts = [], $snmp_v4hosts = [],
$snmp_v6hosts = [], $snmp_v6hosts = [],
$pin_puppet = '3.', $pin_puppet = '3.',
$install_users = true,
$install_resolv_conf = true, $install_resolv_conf = true,
$certname = $::fqdn, $certname = $::fqdn,
$ca_server = undef, $ca_server = undef,
@ -24,8 +23,6 @@ class openstack_project::template (
########################################################### ###########################################################
# Classes for all hosts # Classes for all hosts
include openstack_project::users
if ( $afs ) { if ( $afs ) {
$all_udp = concat( $all_udp = concat(
$iptables_public_udp_ports, [7001]) $iptables_public_udp_ports, [7001])
@ -53,10 +50,6 @@ class openstack_project::template (
snmp_v6hosts => $snmp_v6hosts, snmp_v6hosts => $snmp_v6hosts,
} }
class {'openstack_project::users_install':
install_users => $install_users
}
if ($::osfamily == 'Debian') { if ($::osfamily == 'Debian') {
# NOTE(pabelanger): Puppetlabs only support Ubuntu Trusty and below, # NOTE(pabelanger): Puppetlabs only support Ubuntu Trusty and below,
# anything greater will use the OS version of puppet. # anything greater will use the OS version of puppet.