Merge "Remove configuration management for wiki servers"

This commit is contained in:
Zuul 2022-02-16 17:58:05 +00:00 committed by Gerrit Code Review
commit d0a4710eb0
5 changed files with 2 additions and 144 deletions
inventory/service
manifests
modules.env
modules/openstack_project/manifests

@ -1,3 +0,0 @@
extra_users:
- mkiss
- maxwell

@ -47,8 +47,7 @@ groups:
- codesearch[0-9]*.opendev.org
control-plane-clouds:
- bridge.openstack.org
disabled:
- wiki-upgrade-test.openstack.org
disabled: []
dns:
- adns*.opendev.org
- ns*.opendev.org
@ -143,8 +142,6 @@ groups:
- subunit-worker[0-9]*.open*.org
- translate-dev[0-9]*.open*.org
- translate[0-9]*.open*.org
- wiki-dev[0-9]*.openstack.org
- wiki[0-9]*.openstack.org
puppet4:
- cacti[0-9]*.open*.org
- elasticsearch[0-9]*.open*.org
@ -158,8 +155,6 @@ groups:
- subunit-worker[0-9]*.open*.org
- translate[0-9]*.open*.org
- translate-dev[0-9]*.open*.org
- wiki[0-9]*.openstack.org
- wiki-dev[0-9]*.openstack.org
refstack:
- refstack[0-9]*.openstack.org
registry:
@ -203,12 +198,6 @@ groups:
- storyboard[0-9]*.opendev.org
- translate-dev[0-9]*.open*.org
- translate[0-9]*.open*.org
- wiki-dev[0-9]*.openstack.org
- wiki[0-9]*.openstack.org
wiki:
- wiki[0-9]*.openstack.org
wiki-dev:
- wiki-dev[0-9]*.openstack.org
zookeeper:
- zk[0-9]*.open*.org
zuul-lb:

@ -30,46 +30,6 @@ node /^ethercalc\d+\.open.*\.org$/ {
}
}
# Node-OS: xenial
node /^wiki\d+\.openstack\.org$/ {
$group = "wiki"
class { 'openstack_project::wiki':
bup_user => 'bup-wiki',
serveradmin => hiera('infra_apache_serveradmin'),
site_hostname => 'wiki.openstack.org',
ssl_cert_file_contents => hiera('ssl_cert_file_contents'),
ssl_key_file_contents => hiera('ssl_key_file_contents'),
ssl_chain_file_contents => hiera('ssl_chain_file_contents'),
wg_dbserver => hiera('wg_dbserver'),
wg_dbname => 'openstack_wiki',
wg_dbuser => 'wikiuser',
wg_dbpassword => hiera('wg_dbpassword'),
wg_secretkey => hiera('wg_secretkey'),
wg_upgradekey => hiera('wg_upgradekey'),
wg_recaptchasitekey => hiera('wg_recaptchasitekey'),
wg_recaptchasecretkey => hiera('wg_recaptchasecretkey'),
wg_googleanalyticsaccount => hiera('wg_googleanalyticsaccount'),
}
}
# Node-OS: xenial
node /^wiki-dev\d+\.openstack\.org$/ {
$group = "wiki-dev"
class { 'openstack_project::wiki':
serveradmin => hiera('infra_apache_serveradmin'),
site_hostname => 'wiki-dev.openstack.org',
wg_dbserver => hiera('wg_dbserver'),
wg_dbname => 'openstack_wiki',
wg_dbuser => 'wikiuser',
wg_dbpassword => hiera('wg_dbpassword'),
wg_secretkey => hiera('wg_secretkey'),
wg_upgradekey => hiera('wg_upgradekey'),
wg_recaptchasitekey => hiera('wg_recaptchasitekey'),
wg_recaptchasecretkey => hiera('wg_recaptchasecretkey'),
disallow_robots => true,
}
}
# Node-OS: xenial
node /^logstash\d*\.open.*\.org$/ {
class { 'openstack_project::server': }

@ -44,7 +44,7 @@ SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-mysql"]="3.11.0"
SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-rabbitmq"]="5.2.3"
SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-stdlib"]="4.17.0"
SOURCE_MODULES["https://github.com/rafaelfelix/puppet-pear"]="1.0.3"
# Mediawiki uses the memcached module
# OpenStack-Health uses the memcached module
SOURCE_MODULES["https://github.com/saz/puppet-memcached"]="v2.6.0"
SOURCE_MODULES["https://github.com/stankevich/puppet-python"]="1.9.5"
SOURCE_MODULES["https://github.com/theforeman/puppet-dns"]="4.1.0"
@ -67,7 +67,6 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-kibana"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-log_processor"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-logrotate"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-logstash"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-mediawiki"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-mysql_backup"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-openstack_health"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-pip"]="origin/master"

@ -1,87 +0,0 @@
# == Class: openstack_project::wiki
#
class openstack_project::wiki (
$site_hostname,
$bup_user = undef,
$serveradmin = undef,
$ssl_cert_file_contents = undef,
$ssl_key_file_contents = undef,
$ssl_chain_file_contents = undef,
$wg_dbserver = undef,
$wg_dbname = undef,
$wg_dbuser = undef,
$wg_dbpassword = undef,
$wg_secretkey = undef,
$wg_upgradekey = undef,
$wg_recaptchasitekey = undef,
$wg_recaptchasecretkey = undef,
$wg_googleanalyticsaccount = undef,
$disallow_robots = undef,
) {
package { ['openssl', 'ssl-cert', 'subversion']:
ensure => present;
}
class { 'openstack_project::server': }
class { 'mediawiki':
role => 'all',
mediawiki_location => '/srv/mediawiki/w',
mediawiki_images_location => '/srv/mediawiki/images',
serveradmin => $serveradmin,
site_hostname => $site_hostname,
ssl_cert_file_contents => $ssl_cert_file_contents,
ssl_key_file_contents => $ssl_key_file_contents,
ssl_chain_file_contents => $ssl_chain_file_contents,
wg_dbserver => $wg_dbserver,
wg_dbname => $wg_dbname,
wg_dbuser => $wg_dbuser,
wg_dbpassword => $wg_dbpassword,
wg_secretkey => $wg_secretkey,
wg_upgradekey => $wg_upgradekey,
wg_recaptchasitekey => $wg_recaptchasitekey,
wg_recaptchasecretkey => $wg_recaptchasecretkey,
wg_googleanalyticsaccount => $wg_googleanalyticsaccount,
wg_sitename => 'OpenStack',
wg_logo => "https://${site_hostname}/w/images/thumb/c/c4/OpenStack_Logo_-_notext.png/30px-OpenStack_Logo_-_notext.png",
favicon_path => '/srv/mediawiki/favicon.ico',
disallow_robots => $disallow_robots,
}
class { 'memcached':
max_memory => 2048,
listen_ip => '127.0.0.1',
tcp_port => 11000,
udp_port => 11000,
}
mysql_backup::backup_remote { 'wiki':
database_host => $wg_dbserver,
database_user => $wg_dbuser,
database_password => $wg_dbpassword,
}
file { '/root/.my.cnf':
ensure => link,
target => '/root/.wiki_db.cnf',
require => Mysql_backup::Backup_remote['wiki'],
}
file { '/srv/mediawiki/favicon.ico':
ensure => present,
owner => 'root',
group => 'root',
mode => '0644',
source => 'puppet:///modules/openstack_project/status/favicon.ico',
require => File['/srv/mediawiki'],
}
class { '::elasticsearch':
es_template_config => {
'bootstrap.mlockall' => true,
'discovery.zen.ping.unicast.hosts' => ['localhost'],
},
version => '1.3.2',
heap_size => '1g',
}
}