From: Dan Prince <dprince@redhat.com>
Date: Thu, 10 Nov 2016 12:35:36 +0000 (-0500)
Subject: Deployed server: switch to apply-config hook
X-Git-Tag: opnfv-6.0.0~1324^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f6b1dee0ac88cc35895404e6338141caf36f0f33;p=apex-tripleo-heat-templates.git

Deployed server: switch to apply-config hook

This patch switches the deployed-server.yaml template to use
apply-config instead of os-apply-config. The 'apply-config' hook
is now installed via a package (no longer requires elements for
installation) and supports more signalling options.

This is required to support the undercloud installer which doesn't work
with os-collect-config heat metadata.

Change-Id: I7963fe4f38e8f04c9871fe651d39efec1aa17c41
---

diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml
index da5698e5..d5c5460d 100644
--- a/deployed-server/deployed-server.yaml
+++ b/deployed-server/deployed-server.yaml
@@ -51,7 +51,7 @@ resources:
   InstanceIdConfig:
     type: OS::Heat::StructuredConfig
     properties:
-      group: os-apply-config
+      group: apply-config
       config:
         instance-id: {get_attr: [deployed-server, "OS::stack_id"]}