From 315fa319630fa22ee9e31a058a2a17376b5f1ea3 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 13 Jul 2016 11:29:43 -0400 Subject: Migrate Puppet Hieradata to composable services Migrate puppet/hieradata/*.yaml parameters to puppet/services/*.yaml except for some services that are not composable yet. Co-Authored-By: Juan Antonio Osorio Robles Change-Id: I7e5f8b18ee9aa63a1dffc6facaf88315b07d5fd7 --- puppet/services/nova-vncproxy.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'puppet/services/nova-vncproxy.yaml') diff --git a/puppet/services/nova-vncproxy.yaml b/puppet/services/nova-vncproxy.yaml index d8e04cc8..3e2a3d88 100644 --- a/puppet/services/nova-vncproxy.yaml +++ b/puppet/services/nova-vncproxy.yaml @@ -22,6 +22,8 @@ outputs: value: service_name: nova-vncproxy config_settings: - get_attr: [NovaBase, role_data, config_settings] + map_merge: + - get_attr: [NovaBase, role_data, config_settings] + - nova::vncproxy::enabled: true step_config: | include tripleo::profile::base::nova::vncproxy -- cgit 1.2.3-korg