]>
git.apps.os.sepia.ceph.com Git - ceph-cm-ansible.git/log
Dan Mick [Wed, 15 Mar 2023 01:24:55 +0000 (18:24 -0700)]
Add sentry.ceph.com to checkcerts.py
Signed-off-by: Dan Mick <dmick@redhat.com>
Dan Mick [Thu, 2 Mar 2023 11:06:15 +0000 (03:06 -0800)]
Merge pull request #722 from ceph/paddles-fixes
paddles: Updates required for migration to new host
Dan Mick [Thu, 2 Mar 2023 11:05:12 +0000 (03:05 -0800)]
Merge pull request #723 from ceph/paddles-postgres-exporter
paddles: Deploy postgres-exporter
Zack Cerza [Wed, 1 Mar 2023 00:22:53 +0000 (17:22 -0700)]
paddles: Deploy postgres-exporter
When in containerized mode.
Signed-off-by: Zack Cerza <zack@redhat.com>
Zack Cerza [Tue, 28 Feb 2023 00:13:35 +0000 (17:13 -0700)]
paddles: Tell postgres to trust the Docker network
Signed-off-by: Zack Cerza <zack@redhat.com>
Zack Cerza [Mon, 27 Feb 2023 23:37:32 +0000 (16:37 -0700)]
paddles: Tell postgres to listen on all interfaces
Signed-off-by: Zack Cerza <zack@redhat.com>
Zack Cerza [Mon, 27 Feb 2023 23:29:05 +0000 (16:29 -0700)]
paddles: Correct paddles_docker_packages
python-docker doesn't exist on 20.04; python3-docker does, and also on
18.04, and requires python3-requests.
Signed-off-by: Zack Cerza <zack@redhat.com>
Dan Mick [Tue, 21 Feb 2023 01:33:26 +0000 (17:33 -0800)]
Merge pull request #721 from dmick/wip-checkcerts
Add checkcerts, to use with cron to warn about expiring certs
Dan Mick [Wed, 15 Feb 2023 04:24:04 +0000 (20:24 -0800)]
Add checkcerts, to use with cron to warn about expiring certs
This originally lived on gitbuilder-archive, and I've moved it,
revamped it, added some args, added some hosts, modified some emails,
ported to Py3, stopped using external programs. It's quick to run
in default mode where it just reports to the terminal; it'll also
be quiet and only send email about old certs.
The timezone processing is nonexistent on the reported expiry
date; Python timezone handling is a mess. That could be improved but
not without a deep dive.
Signed-off-by: Dan Mick <dmick@redhat.com>
Dan Mick [Mon, 13 Feb 2023 03:57:19 +0000 (19:57 -0800)]
Merge pull request #715 from ceph/wip-gateway-network-scripts
Installing the network-scripts package as an alternative when disabli…
Adam Kraitman [Tue, 10 Jan 2023 14:07:58 +0000 (16:07 +0200)]
Installing the network-scripts package as an alternative when disabling NM
And removing the nagios packages since we are not using nagios anymore
Signed-off-by: Adam Kraitman <akraitma@redhat.com>
Dan Mick [Wed, 8 Feb 2023 20:47:20 +0000 (12:47 -0800)]
Merge pull request #720 from ceph/wip-centos-8stream
Changing centos9.stream image url to latest version for cobbler deployment
Adam Kraitman [Mon, 30 Jan 2023 12:50:34 +0000 (14:50 +0200)]
Changing centos9.stream image url to latest version for cobbler deployment
Fixes: https://tracker.ceph.com/issues/58492
Signed-off-by: Adam Kraitman <akraitma@redhat.com>
adam kraitman [Mon, 6 Feb 2023 10:10:28 +0000 (12:10 +0200)]
Merge pull request #719 from rakshithakamath94/signalfx-conf
Signalfx agent node configuration
Rakshitha Kamath [Thu, 22 Dec 2022 10:15:07 +0000 (15:45 +0530)]
Signalfx agent node configuration
adam kraitman [Sun, 15 Jan 2023 15:17:00 +0000 (17:17 +0200)]
Merge pull request #718 from ceph/wip-fix-uuid
Forgot to add use_satellite = true in two places
Adam Kraitman [Sun, 15 Jan 2023 15:15:44 +0000 (17:15 +0200)]
Forgot to add use_satellite = true in two places
In continue to PR https://github.com/ceph/ceph-cm-ansible/pull/717
Signed-off-by: Adam Kraitman <akraitma@redhat.com>
adam kraitman [Sun, 15 Jan 2023 15:12:33 +0000 (17:12 +0200)]
Merge pull request #717 from ceph/wip-satellite-uuid
Regenerate random machine UUID before the subscribing to the satellite
Adam Kraitman [Sun, 15 Jan 2023 15:03:23 +0000 (17:03 +0200)]
Regenerate random machine UUID before the subscription to satellite
Fixes: The DMI UUID of this host (XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX) matches other registered hosts
Signed-off-by: Adam Kraitman <akraitma@redhat.com>
adam kraitman [Wed, 11 Jan 2023 13:40:39 +0000 (15:40 +0200)]
Merge pull request #716 from ceph/wip-no-log-remove
Removed no_log to see the spacific errors
Adam Kraitman [Wed, 11 Jan 2023 13:36:44 +0000 (15:36 +0200)]
Removed no_log to see the spacific errors
https://pulpito.ceph.com/yuriw-2023-01-11_12:36:44-rbd-pacific_16.2.11_RC6-distro-default-smithi/
7133168 /
Signed-off-by: Adam Kraitman <akraitma@redhat.com>
Zack Cerza [Tue, 10 Jan 2023 23:05:11 +0000 (16:05 -0700)]
Merge pull request #714 from dmick/main
auth-openvpn: port to python3 for new gw server, futures
Dan Mick [Fri, 6 Jan 2023 00:04:33 +0000 (16:04 -0800)]
auth-openvpn: port to python3 for new gw server, futures
I chose to keep everything in binary throughout. One could also
choose string, but this seemed safer for international characters.
Signed-off-by: Dan Mick <dmick@redhat.com>
adam kraitman [Mon, 2 Jan 2023 09:26:21 +0000 (11:26 +0200)]
Merge pull request #713 from ceph/wip-cpan-fix
Installing cpanminus on apt systems
Adam Kraitman [Mon, 2 Jan 2023 09:23:44 +0000 (11:23 +0200)]
Installing cpanminus on apt systems
Fixes: http://pulpito.front.sepia.ceph.com/yuriw-2023-01-01_20:02:51-krbd-pacific_16.2.11_RC4-testing-default-smithi/7130439/
Signed-off-by: Adam Kraitman <akraitma@redhat.com>
adam kraitman [Sun, 1 Jan 2023 19:51:44 +0000 (21:51 +0200)]
Merge pull request #712 from ceph/wip-cpanm
Using the cpanm ansible module
Adam Kraitman [Sun, 25 Dec 2022 13:51:12 +0000 (15:51 +0200)]
Using the cpanm ansible module
Signed-off-by: Adam Kraitman <akraitma@redhat.com>
Zack Cerza [Tue, 6 Dec 2022 23:19:22 +0000 (16:19 -0700)]
Merge pull request #711 from wolaidajiangyou/main
testnode: fix umount condition match error
sunjunnan [Tue, 6 Dec 2022 03:21:18 +0000 (03:21 +0000)]
testnode: fix umount condition match error
Signed-off-by: Sun Junnan <sunjunnan_yewu@cmss.chinamobile.com>
Signed-off-by: Yang Honggang <yanghonggang_yewu@cmss.chinamobile.com>
Dan Mick [Fri, 2 Dec 2022 22:50:06 +0000 (14:50 -0800)]
Merge pull request #710 from ceph/named-acme-os
nameserver: Updates to enable ACME on OpenShift
Zack Cerza [Mon, 7 Nov 2022 19:34:31 +0000 (12:34 -0700)]
nameserver: New zones don't need to be frozen
Signed-off-by: Zack Cerza <zack@redhat.com>
Zack Cerza [Fri, 4 Nov 2022 17:42:44 +0000 (11:42 -0600)]
named.conf.j2: Make key algorithm configurable
Signed-off-by: Zack Cerza <zack@redhat.com>
adam kraitman [Wed, 31 Aug 2022 16:41:41 +0000 (19:41 +0300)]
Merge pull request #708 from ceph/no-rh-register
cobbler: Do not use redhat_register snippet
adam kraitman [Wed, 31 Aug 2022 16:41:03 +0000 (19:41 +0300)]
Merge pull request #707 from ceph/rhel9-oops
cobbler: CentOS 9 packages on CentOS 9 only
David Galloway [Wed, 31 Aug 2022 16:36:06 +0000 (12:36 -0400)]
cobbler: Do not use redhat_register snippet
We already run `subscription-manager` manually in kickstart so we don't need this snippet.
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Wed, 31 Aug 2022 16:27:42 +0000 (12:27 -0400)]
cobbler: CentOS 9 packages on CentOS 9 only
Signed-off-by: David Galloway <dgallowa@redhat.com>
adam kraitman [Mon, 29 Aug 2022 17:41:29 +0000 (20:41 +0300)]
Merge pull request #706 from ceph/cobbler-pw
cobbler-access: Update script to support Cobbler v3
David Galloway [Mon, 29 Aug 2022 17:37:40 +0000 (13:37 -0400)]
cobbler-access: Update script to support Cobbler v3
See https://cobbler.readthedocs.io/en/v3.2.2/user-guide/web-interface.html#managing-users-digest
Signed-off-by: David Galloway <dgallowa@redhat.com>
adam kraitman [Sun, 28 Aug 2022 06:16:26 +0000 (09:16 +0300)]
Merge pull request #705 from ceph/c9-selinux
common: NRPE works on CentOS 9 now
David Galloway [Fri, 26 Aug 2022 15:57:45 +0000 (11:57 -0400)]
common: NRPE works on CentOS 9 now
Signed-off-by: David Galloway <dgallowa@redhat.com>
adam kraitman [Fri, 26 Aug 2022 07:01:14 +0000 (10:01 +0300)]
Merge pull request #704 from ceph/jenkins-builder-disk
tools: Add jenkins-builder-disk
adam kraitman [Fri, 26 Aug 2022 07:00:03 +0000 (10:00 +0300)]
Merge pull request #703 from ceph/c9-hacks
More CentOS 9 hacks
David Galloway [Thu, 25 Aug 2022 20:43:34 +0000 (16:43 -0400)]
tools: Add jenkins-builder-disk
Used to wipe the larger/faster non-root drive on Jenkins builders and mount the disk at /home/jenkins-build or /var/lib/libvirt/images (whichever is appropriate).
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Thu, 25 Aug 2022 18:55:14 +0000 (14:55 -0400)]
cobbler: Hacks for CentOS 9 on braggi disks
During anaconda/kickstart, the smaller root drive shows up as sdb but then helpfully becomes sda after the OS is installed.
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Thu, 25 Aug 2022 18:52:12 +0000 (14:52 -0400)]
cobbler: Update packages for CentOS 9
Do not install subscription-manager because it's not RHEL...
Do install python3-pip so the container-host role can run during the post install trigger.
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Thu, 25 Aug 2022 18:50:31 +0000 (14:50 -0400)]
cobbler_profile: kernel_options for CentOS 9 Stream
inst.stage2 is required and just `ks` doesn't work anymore and needs `inst.ks`.
This will probably need to be reverted when Sepia gets Cobbler 3 since it will automatically use `inst.*` parameters for CentOS/RHEL9.
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Thu, 25 Aug 2022 18:49:40 +0000 (14:49 -0400)]
cobbler_profile: Use a newer CentOS9 ISO
Has a lot of fixes in it like actually leaves appstream and baseos repos on the server after install
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Thu, 25 Aug 2022 18:29:47 +0000 (14:29 -0400)]
cobbler: Do not do CentOS to Stream conversion hack on CentOS9
It's not necessary and breaks profile import.
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Thu, 25 Aug 2022 19:01:31 +0000 (15:01 -0400)]
cobbler: Don't run repos tag on CentOS9 during trigger
No longer needed as latest CentOS9 ISO fixed this problem.
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Thu, 25 Aug 2022 18:28:50 +0000 (14:28 -0400)]
Revert "cobbler: Put CentOS9 Stream repos in place during kickstart"
This reverts commit
9d277d66e9e96bd2fe5d5490018536ebe0db8140 .
This hack isn't needed with a newer CentOS 9 Stream ISO.
Signed-off-by: David Galloway <dgallowa@redhat.com>
adam kraitman [Thu, 25 Aug 2022 06:51:24 +0000 (09:51 +0300)]
Merge pull request #702 from ceph/not-on-centos9
cobbler: Don't install NetworkManager-initscripts-updown on CentOS9
adam kraitman [Thu, 25 Aug 2022 06:50:23 +0000 (09:50 +0300)]
Merge pull request #701 from ceph/fix-c9-missing-repos
cobbler: Put CentOS9 Stream repos in place during kickstart
David Galloway [Wed, 24 Aug 2022 21:51:45 +0000 (17:51 -0400)]
cobbler: Don't install NetworkManager-initscripts-updown on CentOS9
It's not available.
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Wed, 24 Aug 2022 21:40:40 +0000 (17:40 -0400)]
cobbler: Put CentOS9 Stream repos in place during kickstart
Signed-off-by: David Galloway <dgallowa@redhat.com>
Zack Cerza [Tue, 23 Aug 2022 18:43:44 +0000 (12:43 -0600)]
Merge pull request #700 from ceph/el9
testnode: RHEL9 ceph_dependency_packages_to_remove
David Galloway [Wed, 17 Aug 2022 21:57:15 +0000 (17:57 -0400)]
testnode: Modify ceph_deps_pkgs_to_remove
Removing python-requests removed subscription-manager which understandably causes a massive problem.
This task/list of packages may not even be necessary anyway since it's a relic from the days we didn't reimage testnodes before every job.
Signed-off-by: David Galloway <dgallowa@redhat.com>
adam kraitman [Tue, 23 Aug 2022 17:32:49 +0000 (20:32 +0300)]
Merge pull request #699 from ceph/cobbler-module
Fixes to support Cobbler 3
David Galloway [Tue, 23 Aug 2022 17:03:29 +0000 (13:03 -0400)]
cobbler: Install ansible from epel on RHEL9
This used to be in pip_packages but the distro-provided one is new enough
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Tue, 23 Aug 2022 14:04:40 +0000 (10:04 -0400)]
cobbler: Fix conditional
Not always defined
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Tue, 23 Aug 2022 14:03:48 +0000 (10:03 -0400)]
cobbler: Define a ks_dir
Cobbler2: /var/lib/cobbler/kickstarts
Cobbler3: /var/lib/cobbler/templates
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Mon, 22 Aug 2022 02:15:04 +0000 (22:15 -0400)]
cobbler: Define autoinstall flag based on version
Cobbler2: --kickstart
Cobbler3: --autoinstall
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Mon, 22 Aug 2022 02:05:58 +0000 (22:05 -0400)]
cobbler: Define kernel options flag based on version
Cobbler2: --kopts
Cobbler3: --kernel-options
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Mon, 22 Aug 2022 01:57:21 +0000 (21:57 -0400)]
cobbler: Convert var to int
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Mon, 22 Aug 2022 01:38:56 +0000 (21:38 -0400)]
cobbler: Define settings file path based on version
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Mon, 22 Aug 2022 01:32:28 +0000 (21:32 -0400)]
cobbler: Support RHEL8 when importing tasks and vars
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Mon, 22 Aug 2022 01:20:45 +0000 (21:20 -0400)]
cobbler: Enable Cobbler 3 Stream on RHEL8
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Thu, 18 Aug 2022 15:32:40 +0000 (11:32 -0400)]
Merge pull request #698 from ceph/wip-ifupdown
ifup and ifdown has been deprecated replaced by ip link set $device u…
Adam Kraitman [Thu, 18 Aug 2022 13:47:50 +0000 (16:47 +0300)]
Adding the NetworkManager-initscripts-updown package to rhel9
Signed-off-by: Adam Kraitman <akraitma@redhat.com>
adam kraitman [Thu, 18 Aug 2022 08:58:59 +0000 (11:58 +0300)]
Merge pull request #697 from ceph/el9
RHEL9 support
David Galloway [Wed, 17 Aug 2022 21:57:15 +0000 (17:57 -0400)]
testnode: RHEL9 vars/templates
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Wed, 17 Aug 2022 21:54:24 +0000 (17:54 -0400)]
common: No more lsb!
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Wed, 17 Aug 2022 21:52:53 +0000 (17:52 -0400)]
common: vars for rhel9
Signed-off-by: David Galloway <dgallowa@redhat.com>
Zack Cerza [Wed, 10 Aug 2022 23:12:19 +0000 (17:12 -0600)]
Merge pull request #696 from ceph/jammy-pdev
testnode: Move python-dev to distro-specific vars files
David Galloway [Wed, 10 Aug 2022 19:37:34 +0000 (15:37 -0400)]
testnode: Move python-dev to distro-specific vars files
Signed-off-by: David Galloway <dgallowa@redhat.com>
Zack Cerza [Fri, 5 Aug 2022 21:50:46 +0000 (15:50 -0600)]
Merge pull request #695 from ceph/sdc
cobbler: Install on sdc for cali systems
David Galloway [Fri, 5 Aug 2022 21:18:24 +0000 (17:18 -0400)]
cobbler: Install on sdc for cali systems
Signed-off-by: David Galloway <dgallowa@redhat.com>
Zack Cerza [Fri, 5 Aug 2022 20:08:28 +0000 (14:08 -0600)]
Merge pull request #694 from ceph/seriously
cobbler_systems: Set default_profile to a newer distro
David Galloway [Fri, 5 Aug 2022 19:45:23 +0000 (15:45 -0400)]
cobbler_systems: Set default_profile to a newer distro
I just chose RHEL8.6 because it's available in both Sepia and Octo labs. Ubuntu and CentOS aren't.
Signed-off-by: David Galloway <dgallowa@redhat.com>
Zack Cerza [Fri, 5 Aug 2022 18:37:07 +0000 (12:37 -0600)]
Merge pull request #693 from ceph/jammy2
testnode: Ubuntu Jammy vars
David Galloway [Fri, 5 Aug 2022 16:35:37 +0000 (12:35 -0400)]
testnode: Ubuntu Jammy vars
Signed-off-by: David Galloway <dgallowa@redhat.com>
Zack Cerza [Tue, 26 Jul 2022 20:19:53 +0000 (14:19 -0600)]
Merge pull request #692 from ceph/incerta
tools: Playbook to configure incerta back NIC
David Galloway [Tue, 26 Jul 2022 19:04:15 +0000 (15:04 -0400)]
tools: Playbook to configure incerta back NIC
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Tue, 26 Jul 2022 18:01:59 +0000 (14:01 -0400)]
Merge pull request #673 from ceph/secondary-nic
Move secondary NIC tasks to common role
David Galloway [Mon, 25 Jul 2022 17:13:38 +0000 (13:13 -0400)]
Merge pull request #691 from ceph/containerized-testnodes
testnode: Skip stopping apache2 in containers
Zack Cerza [Mon, 25 Jul 2022 16:34:45 +0000 (10:34 -0600)]
testnode: Skip stopping apache2 in containers
Signed-off-by: Zack Cerza <zack@redhat.com>
Zack Cerza [Tue, 19 Jul 2022 18:39:14 +0000 (12:39 -0600)]
Merge pull request #690 from ceph/irvingi
David Galloway [Tue, 19 Jul 2022 18:37:04 +0000 (14:37 -0400)]
container-host: s/slaves/builders
Signed-off-by: David Galloway <dgallowa@redhat.com>
Dan Mick [Thu, 14 Jul 2022 21:02:03 +0000 (14:02 -0700)]
Merge pull request #689 from ceph/fix-satellite
Reinstall Satellite CA Cert
David Galloway [Thu, 14 Jul 2022 18:53:06 +0000 (14:53 -0400)]
common: Remove, clean up, and reinstall Satellite CA cert
This reverts commit
ed59d0bb3f6470ecf62fc6af19663d0f674dd84e .
This was originally added because if one upgrades the Satellite server, the katello-ca-consumer-latest RPM actually gets an incremented version number and conflicts with an already installed katello-ca RPM. `rpm --reinstall` was not sufficient to "upgrade" the package.
We won't ever be upgrading the Satellite server again and the proper way to "reinstall" the Satellite's CA Cert is to remove it, subscription-manager clean, then reinstall as per https://access.redhat.com/solutions/
3336921 .
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Thu, 14 Jul 2022 14:24:09 +0000 (10:24 -0400)]
Merge pull request #688 from ceph/fix-docs
README: Make doc more specific/clear
David Galloway [Thu, 14 Jul 2022 14:23:35 +0000 (10:23 -0400)]
README: Make doc more specific/clear
Signed-off-by: David Galloway <dgallowa@redhat.com>
Zack Cerza [Tue, 28 Jun 2022 16:57:38 +0000 (10:57 -0600)]
Merge pull request #687 from ceph/zap-rhel
David Galloway [Tue, 28 Jun 2022 16:27:32 +0000 (12:27 -0400)]
testnode: No pkg tasks before repos are set up
Newer versions of RHEL8 don't like having yum called if they don't have repos setup.
When a RHEL8 machine gets provisioned via Cobbler, we zap the disks before we register the server to Satellite (or CDN).
We don't really need to check if gdisk and device-mapper are installed during a Cobbler install because we know they're installed in https://github.com/ceph/ceph-cm-ansible/blob/main/roles/cobbler/templates/snippets/cephlab_packages_rhel
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Tue, 28 Jun 2022 15:24:16 +0000 (11:24 -0400)]
Merge pull request #685 from ceph/curl
common: Install Satellite RPM via rpm command
David Galloway [Tue, 28 Jun 2022 14:43:07 +0000 (10:43 -0400)]
Merge pull request #686 from ceph/scripts
tools: Add a couple workstation scripts
David Galloway [Tue, 28 Jun 2022 14:31:33 +0000 (10:31 -0400)]
tools: Add a couple workstation scripts
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Mon, 27 Jun 2022 22:51:57 +0000 (18:51 -0400)]
common: Install Satellite RPM via rpm command
Seriously... https://access.redhat.com/solutions/
6438061
Signed-off-by: David Galloway <dgallowa@redhat.com>
David Galloway [Mon, 27 Jun 2022 16:05:33 +0000 (12:05 -0400)]
Merge pull request #683 from ceph/zap_disks_paren
testnode: Add missing parenthesis to conditional
adam kraitman [Mon, 27 Jun 2022 14:53:21 +0000 (17:53 +0300)]
Merge pull request #684 from ceph/fqdn
common: RHSM register w/ full hostname
David Galloway [Mon, 27 Jun 2022 14:29:08 +0000 (10:29 -0400)]
common: RHSM register w/ full hostname
For some reason, sometimes hosts try to register with their short hostname. Sometimes with the FQDN.
As of Satellite 6.5, the service won't let you register two different hostnames with the same UUID (https://access.redhat.com/solutions/
4207781 ).
This change makes sure all hosts register with the FQDN so there's no more conflicts.
Signed-off-by: David Galloway <dgallowa@redhat.com>