From 82e75b18849ceb3ac5e88e6ea974b30a69a608ca Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 24 Jun 2015 17:57:10 +0000 Subject: [PATCH] Break out openstack_project::server from static.o.o Change-Id: I2c3c5d0f3075ca1c289dd00d0e529957d2e3dfa7 Signed-off-by: Paul Belanger --- manifests/site.pp | 5 ++++- modules/openstack_project/manifests/static.pp | 7 ------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 1f1c94ded4..e1c7ecbab6 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -476,9 +476,12 @@ node 'storyboard.openstack.org' { # A machine to serve static content. # Node-OS: precise node 'static.openstack.org' { + class { 'openstack_project::server': + iptables_public_tcp_ports => [22, 80, 443], + sysadmins => hiera('sysadmins', []), + } class { 'openstack_project::static': project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', - sysadmins => hiera('sysadmins', []), swift_authurl => 'https://identity.api.rackspacecloud.com/v2.0/', swift_user => 'infra-files-ro', swift_key => hiera('infra_files_ro_password', 'XXX'), diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp index f81487df49..7f9c5736c9 100644 --- a/modules/openstack_project/manifests/static.pp +++ b/modules/openstack_project/manifests/static.pp @@ -1,7 +1,6 @@ # == Class: openstack_project::static # class openstack_project::static ( - $sysadmins = [], $swift_authurl = '', $swift_user = '', $swift_key = '', @@ -15,12 +14,6 @@ class openstack_project::static ( $jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitemail = 'jenkins@openstack.org', ) { - - class { 'openstack_project::server': - iptables_public_tcp_ports => [22, 80, 443], - sysadmins => $sysadmins, - } - class { 'project_config': url => $project_config_repo, }