From 55ad2258449bbdcb62edb2f849ab9ab0244c6dac Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 5 Jul 2019 13:38:56 -0400
Subject: [PATCH] Remove service_names hieradata file

The service_names isn't useful anymore:

- hiera('service_names') has been replaced by hiera('enabled_services')
- sensu::subscriptions moved under the {{role.name.lower()}}_extraconfig
  hieradata file.

This is part of the effort which aims to reduce the number of hieradata
files.

Depends-On: I457f2c81a2cf6cc2f42dc4585b41b0d91dacc059
Change-Id: I22081888541e059cd9f258d15990f58df78c38d2
Closes-Bug: #1835551
---
 overcloud.j2.yaml        | 1 -
 puppet/role.role.j2.yaml | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 0f5cb1ce6a..77cc78efcd 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -978,7 +978,6 @@ resources:
         - config_step
         - {{role.name.lower()}}_extraconfig
         - extraconfig
-        - service_names
         - service_configs
         - cloud_domain
         - bootstrap_node # provided by tripleo-hieradata
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 26bb66eca8..577c6c105b 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -649,12 +649,10 @@ resources:
       value:
         type: json
         datafiles:
-          service_names:
-            service_names: {get_param: ServiceNames}
-            sensu::subscriptions: {get_param: MonitoringSubscriptions}
           service_configs: {get_param: ServiceConfigSettings}
           {{role.name.lower()}}_extraconfig:
             map_merge:
+              - sensu::subscriptions: {get_param: MonitoringSubscriptions}
 {%- if role.deprecated_param_extraconfig is defined %}
               - {get_param: {{role.deprecated_param_extraconfig}}}
 {%- endif %}