Style Guide updates for puppet-lint
Once our gate-ci-puppet-lint job goes live, this will help to get it to pass. Change-Id: I2eb363038b8e63e4b17a3f80cc40dc6c6bf90bee Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com> Reviewed-on: https://review.openstack.org/13722 Reviewed-by: James E. Blair <corvus@inaugust.com> Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Approved: James E. Blair <corvus@inaugust.com> Tested-by: Jenkins
This commit is contained in:
parent
c73536a2c6
commit
f8f2915020
@ -1,15 +1,18 @@
|
||||
# bare-bones slaves spun up by jclouds. Specifically need to not set ssh
|
||||
# login limits, because it screws up jclouds provisioning
|
||||
class openstack_project::bare_slave(
|
||||
$install_users=true,
|
||||
$certname=$fqdn) {
|
||||
$certname = $::fqdn,
|
||||
$install_users = true
|
||||
) {
|
||||
class { 'openstack_project::base':
|
||||
certname => $certname,
|
||||
install_users => $install_users,
|
||||
certname => $certname,
|
||||
}
|
||||
|
||||
class { 'jenkins::slave':
|
||||
ssh_key => "",
|
||||
user => false
|
||||
ssh_key => '',
|
||||
user => false
|
||||
}
|
||||
}
|
||||
|
||||
# vim:sw=2:ts=2:expandtab:textwidth=79
|
||||
|
@ -3,10 +3,12 @@ class openstack_project::community (
|
||||
) {
|
||||
class { 'openstack_project::server':
|
||||
iptables_public_tcp_ports => [80, 443, 8099, 8080],
|
||||
sysadmins => $sysadmins
|
||||
sysadmins => $sysadmins
|
||||
}
|
||||
|
||||
realize (
|
||||
User::Virtual::Localuser["smaffulli"],
|
||||
User::Virtual::Localuser['smaffulli'],
|
||||
)
|
||||
}
|
||||
|
||||
# vim:sw=2:ts=2:expandtab:textwidth=79
|
||||
|
@ -1,4 +1,4 @@
|
||||
class openstack_project::dashboard (
|
||||
class openstack_project::dashboard(
|
||||
$password,
|
||||
$mysql_password,
|
||||
$sysadmins = []
|
||||
@ -6,19 +6,21 @@ class openstack_project::dashboard (
|
||||
|
||||
class { 'openstack_project::server':
|
||||
iptables_public_tcp_ports => [80, 443, 3000],
|
||||
sysadmins => $sysadmins
|
||||
sysadmins => $sysadmins
|
||||
}
|
||||
|
||||
class {'::dashboard':
|
||||
dashboard_ensure => 'present',
|
||||
dashboard_user => 'www-data',
|
||||
dashboard_group => 'www-data',
|
||||
dashboard_password => $password,
|
||||
dashboard_db => 'dashboard_prod',
|
||||
dashboard_charset => 'utf8',
|
||||
dashboard_site => $fqdn,
|
||||
dashboard_port => '3000',
|
||||
mysql_root_pw => $mysql_password,
|
||||
passenger => true,
|
||||
class { '::dashboard':
|
||||
dashboard_ensure => 'present',
|
||||
dashboard_user => 'www-data',
|
||||
dashboard_group => 'www-data',
|
||||
dashboard_password => $password,
|
||||
dashboard_db => 'dashboard_prod',
|
||||
dashboard_charset => 'utf8',
|
||||
dashboard_site => $::fqdn,
|
||||
dashboard_port => '3000',
|
||||
mysql_root_pw => $mysql_password,
|
||||
passenger => true,
|
||||
}
|
||||
}
|
||||
|
||||
# vim:sw=2:ts=2:expandtab:textwidth=79
|
||||
|
@ -4,16 +4,18 @@ class openstack_project::eavesdrop (
|
||||
) {
|
||||
class { 'openstack_project::server':
|
||||
iptables_public_tcp_ports => [80],
|
||||
sysadmins => $sysadmins
|
||||
sysadmins => $sysadmins
|
||||
}
|
||||
include meetbot
|
||||
|
||||
meetbot::site { "openstack":
|
||||
nick => "openstack",
|
||||
nickpass => $nickpass,
|
||||
network => "FreeNode",
|
||||
server => "chat.us.freenode.net:7000",
|
||||
channels => "#openstack #openstack-dev #openstack-meeting",
|
||||
use_ssl => "True"
|
||||
meetbot::site { 'openstack':
|
||||
nick => 'openstack',
|
||||
nickpass => $nickpass,
|
||||
network => 'FreeNode',
|
||||
server => 'chat.us.freenode.net:7000',
|
||||
channels => '#openstack #openstack-dev #openstack-meeting',
|
||||
use_ssl => 'True'
|
||||
}
|
||||
}
|
||||
|
||||
# vim:sw=2:ts=2:expandtab:textwidth=79
|
||||
|
@ -6,19 +6,24 @@ class openstack_project::etherpad (
|
||||
) {
|
||||
class { 'openstack_project::server':
|
||||
iptables_public_tcp_ports => [22, 80, 443],
|
||||
sysadmins => $sysadmins
|
||||
sysadmins => $sysadmins
|
||||
}
|
||||
|
||||
include etherpad_lite
|
||||
include etherpad_lite::backup
|
||||
|
||||
class { 'etherpad_lite::apache':
|
||||
etherpad_crt => $etherpad_crt,
|
||||
etherpad_key => $etherpad_key,
|
||||
etherpad_crt => $etherpad_crt,
|
||||
etherpad_key => $etherpad_key,
|
||||
}
|
||||
|
||||
class { 'etherpad_lite::site':
|
||||
database_password => $database_password,
|
||||
}
|
||||
|
||||
class { 'etherpad_lite::mysql':
|
||||
database_password => $database_password,
|
||||
}
|
||||
include etherpad_lite::backup
|
||||
}
|
||||
|
||||
# vim:sw=2:ts=2:expandtab:textwidth=79
|
||||
|
Loading…
Reference in New Issue
Block a user