From 11b3cb25a9884d8eaed0544a5ef2862e4a046652 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Mon, 26 Jun 2017 09:48:34 -0400 Subject: Revert "Revert "Blacklist support for ExtraConfig"" There is a Heat patch posted (via Depends-On) that resolves the issue that caused this to be reverted. This reverts the revert and we need to make sure all the upgrades jobs pass before we merge this patch. This reverts commit 69936229f4def703cd44ab164d8d1989c9fa37cb. Closes-Bug: #1699463 implements blueprint disable-deployments Change-Id: Iedf680fddfbfc020d301bec8837a0cb98d481eb5 --- puppet/role.role.j2.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'puppet/role.role.j2.yaml') diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index e1a23ab3..d72638b7 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -435,6 +435,7 @@ resources: server: {get_resource: {{role.name}}} RoleParameters: {get_param: RoleParameters} ServiceNames: {get_param: ServiceNames} + deployment_actions: {get_attr: [DeploymentActions, value]} NetworkDeployment: type: OS::TripleO::SoftwareDeployment @@ -547,6 +548,9 @@ resources: {{role.name}}ExtraConfigPre: depends_on: {{role.name}}Deployment type: OS::TripleO::{{role.name}}ExtraConfigPre + # We have to use conditions here so that we don't break backwards + # compatibility with templates everywhere + condition: server_not_blacklisted properties: server: {get_resource: {{role.name}}} @@ -555,6 +559,9 @@ resources: NodeExtraConfig: depends_on: [{{role.name}}ExtraConfigPre, NodeTLSCAData] type: OS::TripleO::NodeExtraConfig + # We have to use conditions here so that we don't break backwards + # compatibility with templates everywhere + condition: server_not_blacklisted properties: server: {get_resource: {{role.name}}} @@ -577,11 +584,21 @@ resources: - ['CREATE', 'UPDATE'] - [] + DeploymentActions: + type: OS::Heat::Value + properties: + value: + if: + - server_not_blacklisted + - ['CREATE', 'UPDATE'] + - [] + SshHostPubKey: type: OS::TripleO::Ssh::HostPubKey depends_on: {{role.name}}Deployment properties: server: {get_resource: {{role.name}}} + deployment_actions: {get_attr: [DeploymentActions, value]} outputs: ip_address: -- cgit 1.2.3-korg