opendev
/
system-config
Code Issues Proposed changes

Add in root level scoping. 

Change-Id: I6fcdf293f719aa3fa18a3c5b4f7d8d64059b6f9c
This commit is contained in:
Monty Taylor 2012-07-23 17:19:55 -05:00
parent a1845d4c5e
commit 0bc0ae7d0c
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ class openstack_project::gerrit (
ensure => present, ensure => present,
} }
class { 'gerrit': class { '::gerrit':
# opinions # opinions
enable_melody => 'true', enable_melody => 'true',
melody_session => 'true', melody_session => 'true',

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

@ -3,7 +3,7 @@
class openstack_project::jclouds_slave { class openstack_project::jclouds_slave {
include openstack_project::base include openstack_project::base
class { 'jenkins_slave': class { '::jenkins_slave':
ssh_key => "", ssh_key => "",
user => false user => false
} }

4
modules/openstack_project/manifests/jenkins_slave.pp
View File

@ -1,10 +1,10 @@
class openstack_project::jenkins_slave { class openstack_project::jenkins_slave {
include tmpreaper include tmpreaper
include apt::unattended-upgrades include apt::unattended-upgrades
class { 'openstack_server': class { 'openstack_project::server':
iptables_public_tcp_ports => [] iptables_public_tcp_ports => []
} }
class { 'jenkins_slave': class { '::jenkins_slave':
ssh_key => $openstack_project::jenkins_ssh_key ssh_key => $openstack_project::jenkins_ssh_key
} }
} }

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

@ -2,7 +2,7 @@ class openstack_project::planet {
class { 'openstack_project::server': class { 'openstack_project::server':
iptables_public_tcp_ports => [80] iptables_public_tcp_ports => [80]
} }
include planet include ::planet
planet::site { "openstack": planet::site { "openstack":
git_url => "https://github.com/openstack/openstack-planet.git" git_url => "https://github.com/openstack/openstack-planet.git"

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

@ -1,6 +1,6 @@
class openstack_project::pypi { class openstack_project::pypi {
# include jenkins slave so that build deps are there for the pip download # include jenkins slave so that build deps are there for the pip download
class { 'jenkins_slave': class { '::jenkins_slave':
ssh_key => "", ssh_key => "",
user => false user => false
} }

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

@ -2,7 +2,7 @@ class openstack_project::slave_template {
class { 'openstack_project::template': class { 'openstack_project::template':
iptables_public_tcp_ports => [] iptables_public_tcp_ports => []
} }
class { 'jenkins_slave': class { '::jenkins_slave':
ssh_key => $openstack_project::jenkins_ssh_key, ssh_key => $openstack_project::jenkins_ssh_key,
sudo => true, sudo => true,
bare => true bare => true