X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=puppet%2Fcontroller-role.yaml;h=6a03265660ec6ed705d82c95d3e367a4967288e6;hb=a763d9993cb7957982fed37e8c6cd49406587071;hp=01f54df0557a68fd95c8fcc0203772f977083f9a;hpb=df361575fab3812790c81f3995198dcc1986857f;p=apex-tripleo-heat-templates.git

diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml
index 01f54df0..6a032656 100644
--- a/puppet/controller-role.yaml
+++ b/puppet/controller-role.yaml
@@ -406,7 +406,6 @@ resources:
     properties:
       server: {get_resource: Controller}
       RoleParameters: {get_param: RoleParameters}
-      deployment_actions: {get_attr: [DeploymentActions, value]}
 
   NetworkConfig:
     type: OS::TripleO::Controller::Net::SoftwareConfig
@@ -553,9 +552,6 @@ resources:
   ControllerExtraConfigPre:
     depends_on: ControllerDeployment
     type: OS::TripleO::ControllerExtraConfigPre
-    # 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: Controller}
 
@@ -564,9 +560,6 @@ resources:
   NodeExtraConfig:
     depends_on: [ControllerExtraConfigPre, NodeTLSData]
     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: Controller}
 
@@ -589,21 +582,11 @@ resources:
         update_identifier:
           get_param: UpdateIdentifier
 
-  DeploymentActions:
-    type: OS::Heat::Value
-    properties:
-      value:
-        if:
-          - server_not_blacklisted
-          - ['CREATE', 'UPDATE']
-          - []
-
   SshHostPubKey:
     type: OS::TripleO::Ssh::HostPubKey
     depends_on: ControllerDeployment
     properties:
         server: {get_resource: Controller}
-        deployment_actions: {get_attr: [DeploymentActions, value]}
 
 outputs:
   ip_address: