From 933f1afefd2ed6cf0f0395651f55fa25afbecad8 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 25 Nov 2016 11:20:57 -0500 Subject: Stop using puppet to configure VIPs in /etc/hosts This patch drops use of the vip-hosts.yaml service which can cause issues during deployment because puppet 'hosts' resources overwrite the data in /etc/hosts. The only reason things seem to work at all at the moment is because our hosts element in t-i-e runs on each os-refresh-config iteration and re-adds the dropped hosts entries. To work around the issue we add a conditional which selectively adds the extra hosts entries only if the AddVipsToEtcHosts is set to true. Closes-bug: 1645123 Change-Id: Ic6aaeb249a127df83894f32a704219683a6382b2 --- environments/use-dns-for-vips.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'environments/use-dns-for-vips.yaml') diff --git a/environments/use-dns-for-vips.yaml b/environments/use-dns-for-vips.yaml index daf07bc7..b700312f 100644 --- a/environments/use-dns-for-vips.yaml +++ b/environments/use-dns-for-vips.yaml @@ -1,5 +1,5 @@ # A Heat environment file which can be used to disable the writing of the VIPs # to the /etc/hosts file in the overcloud. Use this in case you have a working # DNS server that you will provide for the overcloud. -resource_registry: - OS::TripleO::Services::VipHosts: OS::Heat::None +parameter_defaults: + AddVipsToEtcHosts: False -- cgit 1.2.3-korg