From: Dan Prince <dprince@redhat.com>
Date: Tue, 11 Apr 2017 13:14:38 +0000 (-0400)
Subject: docker: use noop_resource for Nova_cell_v2
X-Git-Tag: opnfv-6.0.0~792
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=349eb9320975d55d35365b3290e0c066ccb3938c;p=apex-tripleo-heat-templates.git

docker: use noop_resource for Nova_cell_v2

Per puppet-nova commit 2c743a6bff5b17a85d1e0500f3a9ecb21468204e
there is now a custom resource for Nova_cell_v2 configuration.
As this resource runs automatically regardless of our use
of puppet tags we need to explicitly disable it to be able to
generate Nova API configs for docker.

Change-Id: Id675dc124464acddc3fc5a88b017a351e93ba685
Closes-bug: #1681841
---

diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index 4cd48b75..97fafb09 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -50,7 +50,10 @@ outputs:
           - get_attr: [NovaApiBase, role_data, config_settings]
           - apache::default_vhost: false
       step_config: &step_config
-        get_attr: [NovaApiBase, role_data, step_config]
+        list_join:
+          - "\n"
+          - - "['Nova_cell_v2'].each |String $val| { noop_resource($val) }"
+            - {get_attr: [NovaApiBase, role_data, step_config]}
       service_config_settings: {get_attr: [NovaApiBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config: