opendev/system-config
Code Issues Proposed changes

Move the server class settings out of the ask class

Browse Source 
Story: 2000172
Spec:
http://specs.openstack.org/openstack-infra/infra-specs/specs/server_base_template_refactor.html

Change-Id: I5e3c076c98cee4605f90f8dab473039221cc1c50
This commit is contained in:
George Peristerakis 2015-05-15 16:53:38 -04:00
parent 644c5133a7
commit 252c41d511
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/site.pp
View File

@ -749,8 +749,13 @@ node /^afs.*\..*\.openstack\.org$/ {
# Node-OS: precise # Node-OS: precise
node 'ask.openstack.org' { node 'ask.openstack.org' {
class { 'openstack_project::ask':
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::ask':
db_user => hiera('ask_db_user', 'ask'), db_user => hiera('ask_db_user', 'ask'),
db_password => hiera('ask_db_password', 'XXX'), db_password => hiera('ask_db_password', 'XXX'),
redis_password => hiera('ask_redis_password', 'XXX'), redis_password => hiera('ask_redis_password', 'XXX'),

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

@ -3,7 +3,6 @@
# ask.openstack.org Q&A support website # ask.openstack.org Q&A support website
# #
class openstack_project::ask ( class openstack_project::ask (
$sysadmins = [],
$db_name = 'askbotdb', $db_name = 'askbotdb',
$db_user = undef, $db_user = undef,
$db_password = undef, $db_password = undef,
@ -23,11 +22,6 @@ class openstack_project::ask (
$site_name = 'ask.openstack.org', $site_name = 'ask.openstack.org',
$solr_version = '4.7.2', $solr_version = '4.7.2',
) { ) {
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => $sysadmins,
}
# solr search engine # solr search engine
class { 'solr': class { 'solr':
mirror => 'http://apache.mesi.com.ar/lucene/solr', mirror => 'http://apache.mesi.com.ar/lucene/solr',