Remove kdc02.o.o (replaced by kdc04.o.o)

We no longer need kdc02.o.o (ubuntu trusty), now that kdc04.o.o
(ubuntu xenial) is online.

Change-Id: I92b879f7a233dc81c0d64153b293ac12f7e72a40
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-12-18 15:30:30 -05:00
parent 08ce7827b3
commit 3ee34cf491
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
5 changed files with 6 additions and 23 deletions

View File

@ -46,9 +46,9 @@ Set up host principals for slave propogation::
# execute kadmin.local then run these commands # execute kadmin.local then run these commands
addprinc -randkey host/kdc01.openstack.org addprinc -randkey host/kdc01.openstack.org
addprinc -randkey host/kdc02.openstack.org addprinc -randkey host/kdc04.openstack.org
ktadd host/kdc01.openstack.org ktadd host/kdc01.openstack.org
ktadd host/kdc02.openstack.org ktadd host/kdc04.openstack.org
Copy the file `/etc/krb5.keytab` to the second kdc host. Copy the file `/etc/krb5.keytab` to the second kdc host.
@ -105,8 +105,8 @@ Should you need perform maintenance on the kerberos server that requires
taking kerberos processes offline you can do this by performing your taking kerberos processes offline you can do this by performing your
updates on a single server at a time. updates on a single server at a time.
`kdc01.openstack.org` is our primary server and `kdc02.openstack.org` `kdc01.openstack.org` is our primary server and `kdc04.openstack.org`
is the hot standby. Perform your maintenance on `kdc02.openstack.org` is the hot standby. Perform your maintenance on `kdc04.openstack.org`
first. Then once that is done we can prepare for taking down the first. Then once that is done we can prepare for taking down the
primary. On `kdc01.openstack.org` run:: primary. On `kdc01.openstack.org` run::
@ -114,7 +114,7 @@ primary. On `kdc01.openstack.org` run::
You should see:: You should see::
Database propagation to kdc02.openstack.org: SUCCEEDED Database propagation to kdc04.openstack.org: SUCCEEDED
Once this is done the standby server is ready and we can take kdc01 Once this is done the standby server is ready and we can take kdc01
offline. When kdc01 is back online rerun `run-kprop.sh` to ensure offline. When kdc01 is back online rerun `run-kprop.sh` to ensure
@ -128,7 +128,7 @@ Kerberos uses the following DNS entries::
_kpasswd._udp.openstack.org. 300 IN SRV 0 0 464 kdc01.openstack.org. _kpasswd._udp.openstack.org. 300 IN SRV 0 0 464 kdc01.openstack.org.
_kerberos-adm._tcp.openstack.org. 300 IN SRV 0 0 749 kdc01.openstack.org. _kerberos-adm._tcp.openstack.org. 300 IN SRV 0 0 749 kdc01.openstack.org.
_kerberos-master._udp.openstack.org. 300 IN SRV 0 0 88 kdc01.openstack.org. _kerberos-master._udp.openstack.org. 300 IN SRV 0 0 88 kdc01.openstack.org.
_kerberos._udp.openstack.org. 300 IN SRV 0 0 88 kdc02.openstack.org. _kerberos._udp.openstack.org. 300 IN SRV 0 0 88 kdc04.openstack.org.
_kerberos._udp.openstack.org. 300 IN SRV 0 0 88 kdc01.openstack.org. _kerberos._udp.openstack.org. 300 IN SRV 0 0 88 kdc01.openstack.org.
_kerberos.openstack.org. 300 IN TXT "OPENSTACK.ORG" _kerberos.openstack.org. 300 IN TXT "OPENSTACK.ORG"

View File

@ -443,7 +443,6 @@ cacti_hosts:
- groups.openstack.org - groups.openstack.org
- health.openstack.org - health.openstack.org
- kdc01.openstack.org - kdc01.openstack.org
- kdc02.openstack.org
- kdc04.openstack.org - kdc04.openstack.org
- lists.openstack.org - lists.openstack.org
- logstash-worker01.openstack.org - logstash-worker01.openstack.org

View File

@ -1614,19 +1614,6 @@ node 'kdc01.openstack.org' {
class { 'openstack_project::kdc': } class { 'openstack_project::kdc': }
} }
# Node-OS: trusty
node 'kdc02.openstack.org' {
class { 'openstack_project::server':
iptables_public_tcp_ports => [88, 464, 749, 754],
iptables_public_udp_ports => [88, 464, 749],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::kdc':
slave => true,
}
}
# Node-OS: xenial # Node-OS: xenial
node 'kdc04.openstack.org' { node 'kdc04.openstack.org' {
class { 'openstack_project::server': class { 'openstack_project::server':

View File

@ -6,12 +6,10 @@ class openstack_project::kdc (
realm => 'OPENSTACK.ORG', realm => 'OPENSTACK.ORG',
kdcs => [ kdcs => [
'kdc01.openstack.org', 'kdc01.openstack.org',
'kdc02.openstack.org',
'kdc04.openstack.org', 'kdc04.openstack.org',
], ],
admin_server => 'kdc.openstack.org', admin_server => 'kdc.openstack.org',
slaves => [ slaves => [
'kdc02.openstack.org',
'kdc04.openstack.org', 'kdc04.openstack.org',
], ],
slave => $slave, slave => $slave,

View File

@ -193,7 +193,6 @@ class openstack_project::server (
cache_size => $afs_cache_size, cache_size => $afs_cache_size,
kdcs => [ kdcs => [
'kdc01.openstack.org', 'kdc01.openstack.org',
'kdc02.openstack.org',
'kdc04.openstack.org', 'kdc04.openstack.org',
], ],
} }