Remove groups configuration
This removes the groups servers from our inventory as well as our manifests/modules. We don't run the groups service anymore as many groups migrated to meetup.com independent of us and the others have transitioned there. Change-Id: I7cb76611e6d30e7189821923f36a38dec9ea7241
This commit is contained in:
Clark Boylan
parent
f671c38fa7
commit
08152aa22f
@ -273,8 +273,6 @@ cacti_hosts:
|
||||
- gitea08.opendev.org
|
||||
- grafana.openstack.org
|
||||
- graphite01.opendev.org
|
||||
- groups-dev.openstack.org
|
||||
- groups.openstack.org
|
||||
- health.openstack.org
|
||||
- kdc03.openstack.org
|
||||
- kdc04.openstack.org
|
||||
|
||||
@ -43,8 +43,6 @@ groups:
|
||||
- grafana[0-9]*.open*.org
|
||||
graphite:
|
||||
- graphite*.open*.org
|
||||
groups:
|
||||
- groups*.open*.org
|
||||
health:
|
||||
- health[0-9]*.openstack.org
|
||||
kdc:
|
||||
@ -100,8 +98,6 @@ groups:
|
||||
- firehose[0-9]*.open*.org
|
||||
- grafana[0-9]*.open*.org
|
||||
- graphite*.open*.org
|
||||
- groups-dev*.open*.org
|
||||
- groups*.open*.org
|
||||
- health[0-9]*.openstack.org
|
||||
- kdc[0-9]*.open*.org
|
||||
- lists*.katacontainers.io
|
||||
@ -149,10 +145,8 @@ groups:
|
||||
- etherpad-dev[0-9]*.open*.org
|
||||
- files[0-9]*.open*.org
|
||||
- firehose[0-9]*.open*.org
|
||||
- groups-dev*.open*.org
|
||||
- grafana[0-9]*.open*.org
|
||||
- graphite[0-9]*.open*.org
|
||||
- groups*.open*.org
|
||||
- health[0-9]*.openstack.org
|
||||
- kdc[0-9]*.open*.org
|
||||
- lists*.katacontainers.io
|
||||
@ -221,7 +215,6 @@ groups:
|
||||
- files[0-9]*.open*.org
|
||||
- grafana[0-9]*.open*.org
|
||||
- graphite*.open*.org
|
||||
- groups*.open*.org
|
||||
- health[0-9]*.openstack.org
|
||||
- nb[0-9]*.open*.org
|
||||
- nl[0-9]*.open*.org
|
||||
|
||||
@ -236,20 +236,6 @@ all:
|
||||
region_name: DFW
|
||||
public_v4: 162.209.77.51
|
||||
public_v6: 2001:4800:7818:103:be76:4eff:fe04:763e
|
||||
groups-dev.openstack.org:
|
||||
ansible_host: 2001:4800:780e:510:be76:4eff:fe06:8b84
|
||||
location:
|
||||
cloud: openstackci-rax
|
||||
region_name: DFW
|
||||
public_v4: 198.101.242.197
|
||||
public_v6: 2001:4800:780e:510:be76:4eff:fe06:8b84
|
||||
groups.openstack.org:
|
||||
ansible_host: 2001:4800:7817:103:be76:4eff:fe06:9611
|
||||
location:
|
||||
cloud: openstackci-rax
|
||||
region_name: DFW
|
||||
public_v4: 23.253.230.177
|
||||
public_v6: 2001:4800:7817:103:be76:4eff:fe06:9611
|
||||
health01.openstack.org:
|
||||
ansible_host: 2001:4800:7817:104:be76:4eff:fe04:37bf
|
||||
location:
|
||||
|
||||
@ -157,37 +157,6 @@ node /^graphite\d*\.open.*\.org$/ {
|
||||
}
|
||||
}
|
||||
|
||||
# Node-OS: trusty
|
||||
# Node-OS: xenial
|
||||
node /^groups\d*\.open.*\.org$/ {
|
||||
class { 'openstack_project::server': }
|
||||
class { 'openstack_project::groups':
|
||||
site_admin_password => hiera('groups_site_admin_password'),
|
||||
site_mysql_host => hiera('groups_site_mysql_host', 'localhost'),
|
||||
site_mysql_password => hiera('groups_site_mysql_password'),
|
||||
conf_cron_key => hiera('groups_conf_cron_key'),
|
||||
site_ssl_cert_file_contents => hiera('groups_site_ssl_cert_file_contents', undef),
|
||||
site_ssl_key_file_contents => hiera('groups_site_ssl_key_file_contents', undef),
|
||||
site_ssl_chain_file_contents => hiera('groups_site_ssl_chain_file_contents', undef),
|
||||
}
|
||||
}
|
||||
|
||||
# Node-OS: trusty
|
||||
# Node-OS: xenial
|
||||
node /^groups-dev\d*\.open.*\.org$/ {
|
||||
class { 'openstack_project::server': }
|
||||
class { 'openstack_project::groups_dev':
|
||||
site_admin_password => hiera('groups_dev_site_admin_password'),
|
||||
site_mysql_host => hiera('groups_dev_site_mysql_host', 'localhost'),
|
||||
site_mysql_password => hiera('groups_dev_site_mysql_password'),
|
||||
conf_cron_key => hiera('groups_dev_conf_cron_key'),
|
||||
site_ssl_cert_file_contents => hiera('groups_dev_site_ssl_cert_file_contents', undef),
|
||||
site_ssl_key_file_contents => hiera('groups_dev_site_ssl_key_file_contents', undef),
|
||||
site_ssl_cert_file => '/etc/ssl/certs/groups-dev.openstack.org.pem',
|
||||
site_ssl_key_file => '/etc/ssl/private/groups-dev.openstack.org.key',
|
||||
}
|
||||
}
|
||||
|
||||
# Node-OS: trusty
|
||||
# Node-OS: xenial
|
||||
node /^lists\d*\.open.*\.org$/ {
|
||||
|
||||
@ -1,82 +0,0 @@
|
||||
# Copyright 2013 OpenStack Foundation
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
#
|
||||
# User group management server
|
||||
#
|
||||
class openstack_project::groups (
|
||||
$site_admin_password = '',
|
||||
$site_mysql_host = '',
|
||||
$site_mysql_password = '',
|
||||
$site_mysql_user = 'groups',
|
||||
$conf_cron_key = '',
|
||||
$site_ssl_cert_file_contents = undef,
|
||||
$site_ssl_key_file_contents = undef,
|
||||
$site_ssl_chain_file_contents = undef,
|
||||
$site_ssl_cert_file = '/etc/ssl/certs/groups.openstack.org.pem',
|
||||
$site_ssl_key_file = '/etc/ssl/private/groups.openstack.org.key',
|
||||
$site_ssl_chain_file = '/etc/ssl/certs/groups.openstack.org_ca.pem',
|
||||
) {
|
||||
|
||||
vcsrepo { '/srv/groups-static-pages':
|
||||
ensure => latest,
|
||||
provider => git,
|
||||
revision => 'master',
|
||||
source => 'https://opendev.org/osf/groups-static-pages',
|
||||
}
|
||||
|
||||
class { 'drupal':
|
||||
site_name => 'groups.openstack.org',
|
||||
site_root => '/srv/vhosts/groups.openstack.org',
|
||||
site_mysql_host => $site_mysql_host,
|
||||
site_mysql_user => $site_mysql_user,
|
||||
site_mysql_password => $site_mysql_password,
|
||||
site_mysql_database => 'groups',
|
||||
site_vhost_root => '/srv/vhosts',
|
||||
site_admin_password => $site_admin_password,
|
||||
site_alias => 'groups',
|
||||
site_profile => 'groups',
|
||||
site_base_url => 'http://groups.openstack.org',
|
||||
site_ssl_enabled => true,
|
||||
site_ssl_cert_file_contents => $site_ssl_cert_file_contents,
|
||||
site_ssl_key_file_contents => $site_ssl_key_file_contents,
|
||||
site_ssl_chain_file_contents => $site_ssl_chain_file_contents,
|
||||
site_ssl_cert_file => $site_ssl_cert_file,
|
||||
site_ssl_key_file => $site_ssl_key_file,
|
||||
site_ssl_chain_file => $site_ssl_chain_file,
|
||||
package_repository => 'http://tarballs.openstack.org/groups/drupal-updates/release-history',
|
||||
package_branch => 'stable',
|
||||
conf => {
|
||||
'cron_key' => $conf_cron_key,
|
||||
'groups_feeds_markdown_directory' => '/srv/groups-static-pages',
|
||||
'googleanalytics_account' => 'UA-17511903-1',
|
||||
'groups_openid_provider' => 'https://openstackid.org'
|
||||
},
|
||||
require => [ Class['openstack_project::server'],
|
||||
Vcsrepo['/srv/groups-static-pages'] ],
|
||||
}
|
||||
|
||||
mysql_backup::backup_remote { 'groups':
|
||||
database_host => $site_mysql_host,
|
||||
database_user => $site_mysql_user,
|
||||
database_password => $site_mysql_password,
|
||||
require => Class['drupal'],
|
||||
}
|
||||
|
||||
include bup
|
||||
bup::site { 'ord.rax':
|
||||
backup_user => 'bup-groups',
|
||||
backup_server => 'backup01.ord.rax.ci.openstack.org',
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,65 +0,0 @@
|
||||
# Copyright 2013 OpenStack Foundation
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
#
|
||||
# User group management dev server
|
||||
#
|
||||
class openstack_project::groups_dev (
|
||||
$site_admin_password = '',
|
||||
$site_mysql_host = '',
|
||||
$site_mysql_password = '',
|
||||
$conf_cron_key = '',
|
||||
$site_ssl_cert_file_contents = undef,
|
||||
$site_ssl_key_file_contents = undef,
|
||||
$site_ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
|
||||
$site_ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key',
|
||||
) {
|
||||
|
||||
# include drupal
|
||||
|
||||
vcsrepo { '/srv/groups-static-pages':
|
||||
ensure => latest,
|
||||
provider => git,
|
||||
revision => 'master',
|
||||
source => 'https://opendev.org/osf/groups-static-pages',
|
||||
}
|
||||
|
||||
class { 'drupal':
|
||||
site_name => 'groups-dev.openstack.org',
|
||||
site_root => '/srv/vhosts/groups-dev.openstack.org',
|
||||
site_mysql_host => $site_mysql_host,
|
||||
site_mysql_user => 'groups',
|
||||
site_mysql_password => $site_mysql_password,
|
||||
site_mysql_database => 'groups_dev',
|
||||
site_vhost_root => '/srv/vhosts',
|
||||
site_admin_password => $site_admin_password,
|
||||
site_alias => 'groupsdev',
|
||||
site_profile => 'groups',
|
||||
site_base_url => 'http://groups-dev.openstack.org',
|
||||
site_ssl_enabled => true,
|
||||
site_ssl_cert_file_contents => $site_ssl_cert_file_contents,
|
||||
site_ssl_key_file_contents => $site_ssl_key_file_contents,
|
||||
site_ssl_cert_file => $site_ssl_cert_file,
|
||||
site_ssl_key_file => $site_ssl_key_file,
|
||||
package_repository => 'http://tarballs.openstack.org/groups/drupal-updates/release-history',
|
||||
package_branch => 'dev',
|
||||
conf => {
|
||||
'cron_key' => $conf_cron_key,
|
||||
'groups_feeds_markdown_directory' => '/srv/groups-static-pages',
|
||||
'groups_openid_provider' => 'https://openstackid.org'
|
||||
},
|
||||
require => [ Class['openstack_project::server'],
|
||||
Vcsrepo['/srv/groups-static-pages'] ]
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user