opendev/system-config
Code Issues Proposed changes

Merge "Remove AFS puppet"

Browse Source
This commit is contained in:
Zuul 2021-02-04 03:52:44 +00:00 committed by Gerrit Code Review
commit e3e555d9fd
5 changed files with 1 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/source/afs.rst
View File

@ -27,11 +27,8 @@ At a Glance
* afs02.dfw.openstack.org (a second fileserver in DFW) * afs02.dfw.openstack.org (a second fileserver in DFW)
* afs01.ord.openstack.org (a fileserver in ORD) * afs01.ord.openstack.org (a fileserver in ORD)
* mirror-update.opendev.org (host running mirror update jobs) * mirror-update.opendev.org (host running mirror update jobs)
:Puppet:
* https://opendev.org/opendev/puppet-openafs
* :git_file:`modules/openstack_project/manifests/afsdb.pp`
* :git_file:`modules/openstack_project/manifests/afsfs.pp`
:Ansible: :Ansible:
* :git_file:`playbooks/service-afs.yaml`
* :git_file:`playbooks/service-mirror.yaml` * :git_file:`playbooks/service-mirror.yaml`
* :git_file:`playbooks/service-mirror-update.yaml` * :git_file:`playbooks/service-mirror-update.yaml`
:Projects: :Projects:

27
manifests/site.pp
View File

@ -482,33 +482,6 @@ node /^kdc04\.open.*\.org$/ {
} }
} }
# Node-OS: xenial
node /^afsdb01\.open.*\.org$/ {
$group = "afsdb"
class { 'openstack_project::server': }
include openstack_project::afsdb
}
# Node-OS: xenial
node /^afsdb.*\.open.*\.org$/ {
$group = "afsdb"
class { 'openstack_project::server': }
include openstack_project::afsdb
}
# Node-OS: xenial
node /^afs.*\..*\.open.*\.org$/ {
$group = "afs"
class { 'openstack_project::server': }
include openstack_project::afsfs
}
# Node-OS: xenial # Node-OS: xenial
node /^ask\d*\.open.*\.org$/ { node /^ask\d*\.open.*\.org$/ {

11
modules/openstack_project/manifests/afsdb.pp
View File

@ -1,11 +0,0 @@
# AFS DB Server
class openstack_project::afsdb (
) {
class { '::openstack_project::afsfs': }
class { '::openafs::dbserver':
require => Class['Openstack_project::Afsfs'],
}
}

19
modules/openstack_project/manifests/afsfs.pp
View File

@ -1,19 +0,0 @@
# AFS Fileserver/BOS
class openstack_project::afsfs (
$cell = 'openstack.org',
) {
class { '::openafs::fileserver':
cell => $cell,
dbservers => [
{
name => 'afsdb01.openstack.org',
ip => '104.130.136.20',
},
{
name => 'afsdb02.openstack.org',
ip => '23.253.200.228',
},
],
}
}

17
modules/openstack_project/templates/mirror-update/afsmon.cfg.erb
View File

@ -1,17 +0,0 @@
[main]
# Enable debugging output
debug = True
# If specified, all fileservers in this cell will be queried
cell = openstack.org
# You can specify a specific list of fileservers. This is appended to
# the cell fileservers if present, otherwise is the canonical list
#fileservers = afs01.dfw.openstack.org
# fileserver02.afs.company.com
# fileserver03.afs.company.com
# Options for remote statsd host if required
[statsd]
host = graphite.opendev.org
port = 8125