opendev/system-config
Code Issues Proposed changes

Merge "kerberos: switch servers to Ansible control"

Browse Source
This commit is contained in:
Zuul 2021-03-17 04:03:03 +00:00 committed by Gerrit Code Review
commit df9a85e45c
3 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
inventory/service/groups.yaml
View File

@ -72,8 +72,13 @@ groups:
- health[0-9]*.openstack.org - health[0-9]*.openstack.org
jvb: jvb:
- jvb[0-9]*.opendev.org - jvb[0-9]*.opendev.org
kdc: kerberos-kdc:
- kdc[0-9]*.open*.org - kdc03.openstack.org
- kdc04.openstack.org
kerberos-kdc-primary:
- kdc03.openstack.org
kerberos-kdc-replica:
- kdc04.openstack.org
letsencrypt: letsencrypt:
- codesearch[0-9]*.opendev.org - codesearch[0-9]*.opendev.org
- etherpad[0-9]*.opendev.org - etherpad[0-9]*.opendev.org
@ -130,7 +135,6 @@ groups:
- ethercalc[0-9]*.open*.org - ethercalc[0-9]*.open*.org
- firehose[0-9]*.open*.org - firehose[0-9]*.open*.org
- health[0-9]*.openstack.org - health[0-9]*.openstack.org
- kdc[0-9]*.open*.org
- lists*.katacontainers.io - lists*.katacontainers.io
- lists*.open*.org - lists*.open*.org
- logstash-worker[0-9]*.open*.org - logstash-worker[0-9]*.open*.org
@ -160,7 +164,6 @@ groups:
- ethercalc[0-9]*.open*.org - ethercalc[0-9]*.open*.org
- firehose[0-9]*.open*.org - firehose[0-9]*.open*.org
- health[0-9]*.openstack.org - health[0-9]*.openstack.org
- kdc[0-9]*.open*.org
- lists*.katacontainers.io - lists*.katacontainers.io
- lists*.open*.org - lists*.open*.org
- lists-dev[0-9]*.open*.org - lists-dev[0-9]*.open*.org

16
manifests/site.pp
View File

@ -433,22 +433,6 @@ node /^openstackid-dev\d*\.openstack\.org$/ {
} }
} }
# Node-OS: xenial
node /^kdc03\.open.*\.org$/ {
class { 'openstack_project::server': }
class { 'openstack_project::kdc': }
}
# Node-OS: xenial
node /^kdc04\.open.*\.org$/ {
class { 'openstack_project::server': }
class { 'openstack_project::kdc':
slave => true,
}
}
# Node-OS: xenial # Node-OS: xenial
node /^ask\d*\.open.*\.org$/ { node /^ask\d*\.open.*\.org$/ {

17
modules/openstack_project/manifests/kdc.pp
View File

@ -1,17 +0,0 @@
# kerberos kdc servers
class openstack_project::kdc (
$slave = false,
) {
class { 'kerberos::server':
realm => 'OPENSTACK.ORG',
kdcs => [
'kdc03.openstack.org',
'kdc04.openstack.org',
],
admin_server => 'kdc.openstack.org',
slaves => [
'kdc04.openstack.org',
],
slave => $slave,
}
}