opendev
/
system-config
Code Issues Proposed changes

Moved the server class out of the status class 

Change-Id: Ia32843de94a913f2c227fe30a4f25425dd08e417
Story: 2000172
Spec: http://specs.openstack.org/openstack-infra/infra-specs/specs/server_base_template_refactor.html
This commit is contained in:
George Peristerakis 2015-05-27 14:55:10 -04:00
parent 703238ad98
commit 424caa59a1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/site.pp
View File

@ -473,8 +473,12 @@ node 'static.openstack.org' {
# A machine to serve various project status updates.
# Node-OS: precise
node 'status.openstack.org' {
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::status':
sysadmins => hiera('sysadmins', []),
gerrit_host => 'review.openstack.org',
gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents', 'XXX'),
reviewday_ssh_public_key => hiera('reviewday_rsa_pubkey_contents', 'XXX'),

6
modules/openstack_project/manifests/status.pp
View File

@ -1,7 +1,6 @@
# == Class: openstack_project::status
#
class openstack_project::status (
$sysadmins = [],
$gerrit_host,
$gerrit_ssh_host_key,
$reviewday_ssh_public_key = '',
@ -19,11 +18,6 @@ class openstack_project::status (
$jenkins_gitemail = 'jenkins@openstack.org',
) {
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => $sysadmins,
}
include openstack_project
class { 'jenkins::jenkinsuser':
ssh_key => $openstack_project::jenkins_ssh_key,