From 424caa59a10ef18275bab28417cb8ecfaedab031 Mon Sep 17 00:00:00 2001 From: George Peristerakis Date: Wed, 27 May 2015 14:55:10 -0400 Subject: [PATCH] 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 --- manifests/site.pp | 6 +++++- modules/openstack_project/manifests/status.pp | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 9f26a6e91a..292354f701 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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'), diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp index d5bdaaa157..45375326f7 100644 --- a/modules/openstack_project/manifests/status.pp +++ b/modules/openstack_project/manifests/status.pp @@ -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,