From 933f1afefd2ed6cf0f0395651f55fa25afbecad8 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
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
---
 puppet/services/vip-hosts.yaml | 56 ------------------------------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 puppet/services/vip-hosts.yaml

(limited to 'puppet')

diff --git a/puppet/services/vip-hosts.yaml b/puppet/services/vip-hosts.yaml
deleted file mode 100644
index a9d757ee..00000000
--- a/puppet/services/vip-hosts.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-heat_template_version: 2016-04-08
-
-description: >
-  If the deployer doesn't have a DNS server for the overcloud nodes. This will
-  populate the node-names and IPs for the VIPs of the overcloud.
-
-parameters:
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry.  This
-                 mapping overrides those in ServiceNetMapDefaults.
-    type: json
-  DefaultPasswords:
-    default: {}
-    type: json
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-
-outputs:
-  role_data:
-    description: role data for the VIP hosts role
-    value:
-      service_name: vip_hosts
-      config_settings:
-        tripleo::vip_hosts::hosts_spec:
-          external:
-            name: "%{hiera('cloud_name_external')}"
-            ip: "%{hiera('public_virtual_ip')}"
-            ensure: present
-            comment: FQDN of the external VIP
-          internal_api:
-            name: "%{hiera('cloud_name_internal_api')}"
-            ip: "%{hiera('internal_api_virtual_ip')}"
-            ensure: present
-            comment: FQDN of the internal api VIP
-          storage:
-            name: "%{hiera('cloud_name_storage')}"
-            ip: "%{hiera('storage_virtual_ip')}"
-            ensure: present
-            comment: FQDN of the storage VIP
-          storage_mgmt:
-            name: "%{hiera('cloud_name_storage_mgmt')}"
-            ip: "%{hiera('storage_mgmt_virtual_ip')}"
-            ensure: present
-            comment: FQDN of the storage mgmt VIP
-          ctlplane:
-            name: "%{hiera('cloud_name_ctlplane')}"
-            ip: "%{hiera('controller_virtual_ip')}"
-            ensure: present
-            comment: FQDN of the ctlplane VIP
-      step_config: |
-        include ::tripleo::vip_hosts
-- 
cgit 1.2.3-korg