From 20783e54c630b6cd613d0fab6475f8b83e4ff8a1 Mon Sep 17 00:00:00 2001 From: George Peristerakis Date: Tue, 19 May 2015 14:16:18 -0400 Subject: [PATCH] Moved the server class settings out of the eavesdrop class Change-Id: Ieb002b252783fc3d9da0c8392d972c940711f5f4 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/eavesdrop.pp | 5 ----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 9f26a6e91a..bab203cb1d 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -261,10 +261,14 @@ node 'planet.openstack.org' { # Node-OS: precise node 'eavesdrop.openstack.org' { + class { 'openstack_project::server': + iptables_public_tcp_ports => [80], + sysadmins => hiera('sysadmins', []), + } + class { 'openstack_project::eavesdrop': project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', nickpass => hiera('openstack_meetbot_password', 'XXX'), - sysadmins => hiera('sysadmins', []), statusbot_nick => hiera('statusbot_nick', 'username'), statusbot_password => hiera('statusbot_nick_password', 'XXX'), statusbot_server => 'chat.freenode.net', diff --git a/modules/openstack_project/manifests/eavesdrop.pp b/modules/openstack_project/manifests/eavesdrop.pp index 7d8e53ce3f..51a084db45 100644 --- a/modules/openstack_project/manifests/eavesdrop.pp +++ b/modules/openstack_project/manifests/eavesdrop.pp @@ -2,7 +2,6 @@ class openstack_project::eavesdrop ( $nickpass = '', - $sysadmins = [], $statusbot_nick = '', $statusbot_password = '', $statusbot_server = '', @@ -16,10 +15,6 @@ class openstack_project::eavesdrop ( $accessbot_password = '', $project_config_repo = '', ) { - class { 'openstack_project::server': - iptables_public_tcp_ports => [80], - sysadmins => $sysadmins - } include apache include meetbot