summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-19 21:22:45 +0000
committerGerrit Code Review <review@openstack.org>2017-06-19 21:22:45 +0000
commit27a92d279e623b96550310354f3b83fea82fef87 (patch)
tree8be40a6b91832f101e7657f8bd4493f756029eab
parent11a97ec7430118bbf4a11c87eceb3adec40ea4ac (diff)
parentd6c0979eb3de79b8c3a79ea5798498f0241eb32d (diff)
Merge "Blacklist support for ExtraConfig"
-rw-r--r--extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml25
-rw-r--r--extraconfig/pre_network/config_then_reboot.yaml24
-rw-r--r--extraconfig/pre_network/host_config_and_reboot.role.j2.yaml23
-rw-r--r--extraconfig/pre_network/host_config_and_reboot.yaml23
-rw-r--r--extraconfig/tasks/ssh/host_public_key.yaml8
-rw-r--r--puppet/blockstorage-role.yaml14
-rw-r--r--puppet/cephstorage-role.yaml17
-rw-r--r--puppet/compute-role.yaml17
-rw-r--r--puppet/controller-role.yaml17
-rw-r--r--puppet/objectstorage-role.yaml14
-rw-r--r--puppet/role.role.j2.yaml17
11 files changed, 192 insertions, 7 deletions
diff --git a/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml b/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
index 96632bc..fb0d169 100644
--- a/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
+++ b/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
@@ -59,6 +59,19 @@ parameters:
59 description: | 59 description: |
60 When enabled, the system will perform a yum update after performing the 60 When enabled, the system will perform a yum update after performing the
61 RHEL Registration process. 61 RHEL Registration process.
62 deployment_actions:
63 default: ['CREATE', 'UPDATE']
64 type: comma_delimited_list
65 description: >
66 List of stack actions that will trigger any deployments in this
67 templates. The actions will be an empty list of the server is in the
68 toplevel DeploymentServerBlacklist parameter's value.
69
70conditions:
71 deployment_actions_empty:
72 equals:
73 - {get_param: deployment_actions}
74 - []
62 75
63resources: 76resources:
64 77
@@ -136,7 +149,11 @@ resources:
136 name: RHELUnregistrationDeployment 149 name: RHELUnregistrationDeployment
137 server: {get_param: server} 150 server: {get_param: server}
138 config: {get_resource: RHELUnregistration} 151 config: {get_resource: RHELUnregistration}
139 actions: ['DELETE'] # Only do this on DELETE 152 actions:
153 if:
154 - deployment_actions_empty
155 - []
156 - ['DELETE'] # Only do this on DELETE
140 input_values: 157 input_values:
141 REG_METHOD: {get_param: rhel_reg_method} 158 REG_METHOD: {get_param: rhel_reg_method}
142 159
@@ -169,7 +186,11 @@ resources:
169 name: UpdateDeploymentAfterRHELRegistration 186 name: UpdateDeploymentAfterRHELRegistration
170 config: {get_resource: YumUpdateConfigurationAfterRHELRegistration} 187 config: {get_resource: YumUpdateConfigurationAfterRHELRegistration}
171 server: {get_param: server} 188 server: {get_param: server}
172 actions: ['CREATE'] # Only do this on CREATE 189 actions:
190 if:
191 - deployment_actions_empty
192 - []
193 - ['CREATE'] # Only do this on CREATE
173 194
174outputs: 195outputs:
175 deploy_stdout: 196 deploy_stdout:
diff --git a/extraconfig/pre_network/config_then_reboot.yaml b/extraconfig/pre_network/config_then_reboot.yaml
index 48ba526..79cb7cb 100644
--- a/extraconfig/pre_network/config_then_reboot.yaml
+++ b/extraconfig/pre_network/config_then_reboot.yaml
@@ -7,6 +7,19 @@ description: >
7parameters: 7parameters:
8 server: 8 server:
9 type: string 9 type: string
10 deployment_actions:
11 default: ['CREATE', 'UPDATE']
12 type: comma_delimited_list
13 description: >
14 List of stack actions that will trigger any deployments in this
15 templates. The actions will be an empty list of the server is in the
16 toplevel DeploymentServerBlacklist parameter's value.
17
18conditions:
19 deployment_actions_empty:
20 equals:
21 - {get_param: deployment_actions}
22 - []
10 23
11resources: 24resources:
12 25
@@ -24,6 +37,11 @@ resources:
24 name: SomeDeployment 37 name: SomeDeployment
25 server: {get_param: server} 38 server: {get_param: server}
26 config: {get_resource: SomeConfig} 39 config: {get_resource: SomeConfig}
40 actions:
41 if:
42 - deployment_actions_empty
43 - []
44 - ['CREATE'] # Only do this on CREATE
27 actions: ['CREATE'] # Only do this on CREATE 45 actions: ['CREATE'] # Only do this on CREATE
28 46
29 RebootConfig: 47 RebootConfig:
@@ -44,5 +62,9 @@ resources:
44 name: RebootDeployment 62 name: RebootDeployment
45 server: {get_param: server} 63 server: {get_param: server}
46 config: {get_resource: RebootConfig} 64 config: {get_resource: RebootConfig}
47 actions: ['CREATE'] # Only do this on CREATE 65 actions:
66 if:
67 - deployment_actions_empty
68 - []
69 - ['CREATE'] # Only do this on CREATE
48 signal_transport: NO_SIGNAL 70 signal_transport: NO_SIGNAL
diff --git a/extraconfig/pre_network/host_config_and_reboot.role.j2.yaml b/extraconfig/pre_network/host_config_and_reboot.role.j2.yaml
index 41d8f4f..fe52ef7 100644
--- a/extraconfig/pre_network/host_config_and_reboot.role.j2.yaml
+++ b/extraconfig/pre_network/host_config_and_reboot.role.j2.yaml
@@ -19,6 +19,13 @@ parameters:
19 {{role}}HostCpusList: 19 {{role}}HostCpusList:
20 type: string 20 type: string
21 default: "" 21 default: ""
22 deployment_actions:
23 default: ['CREATE', 'UPDATE']
24 type: comma_delimited_list
25 description: >
26 List of stack actions that will trigger any deployments in this
27 templates. The actions will be an empty list of the server is in the
28 toplevel DeploymentServerBlacklist parameter's value.
22 29
23parameter_group: 30parameter_group:
24 - label: deprecated 31 - label: deprecated
@@ -38,6 +45,10 @@ conditions:
38 equals: 45 equals:
39 - get_param: {{role}}TunedProfileName 46 - get_param: {{role}}TunedProfileName
40 - "" 47 - ""
48 deployment_actions_empty:
49 equals:
50 - {get_param: deployment_actions}
51 - []
41 52
42resources: 53resources:
43 54
@@ -62,7 +73,11 @@ resources:
62 name: HostParametersDeployment 73 name: HostParametersDeployment
63 server: {get_param: server} 74 server: {get_param: server}
64 config: {get_resource: HostParametersConfig} 75 config: {get_resource: HostParametersConfig}
65 actions: ['CREATE'] # Only do this on CREATE 76 actions:
77 if:
78 - deployment_actions_empty
79 - []
80 - ['CREATE'] # Only do this on CREATE
66 input_values: 81 input_values:
67 _KERNEL_ARGS_: {get_param: {{role}}KernelArgs} 82 _KERNEL_ARGS_: {get_param: {{role}}KernelArgs}
68 _TUNED_PROFILE_NAME_: {get_param: {{role}}TunedProfileName} 83 _TUNED_PROFILE_NAME_: {get_param: {{role}}TunedProfileName}
@@ -88,7 +103,11 @@ resources:
88 name: RebootDeployment 103 name: RebootDeployment
89 server: {get_param: server} 104 server: {get_param: server}
90 config: {get_resource: RebootConfig} 105 config: {get_resource: RebootConfig}
91 actions: ['CREATE'] # Only do this on CREATE 106 actions:
107 if:
108 - deployment_actions_empty
109 - []
110 - ['CREATE'] # Only do this on CREATE
92 signal_transport: NO_SIGNAL 111 signal_transport: NO_SIGNAL
93 112
94outputs: 113outputs:
diff --git a/extraconfig/pre_network/host_config_and_reboot.yaml b/extraconfig/pre_network/host_config_and_reboot.yaml
index 74e716a..21309dd 100644
--- a/extraconfig/pre_network/host_config_and_reboot.yaml
+++ b/extraconfig/pre_network/host_config_and_reboot.yaml
@@ -11,9 +11,20 @@ parameters:
11 type: json 11 type: json
12 description: Role Specific parameters 12 description: Role Specific parameters
13 default: {} 13 default: {}
14 deployment_actions:
15 default: ['CREATE', 'UPDATE']
16 type: comma_delimited_list
17 description: >
18 List of stack actions that will trigger any deployments in this
19 templates. The actions will be an empty list of the server is in the
20 toplevel DeploymentServerBlacklist parameter's value.
14 21
15conditions: 22conditions:
16 is_host_config_required: {not: {equals: [{get_param: [RoleParameters, KernelArgs]}, ""]}} 23 is_host_config_required: {not: {equals: [{get_param: [RoleParameters, KernelArgs]}, ""]}}
24 deployment_actions_empty:
25 equals:
26 - {get_param: deployment_actions}
27 - []
17 28
18resources: 29resources:
19 HostParametersConfig: 30 HostParametersConfig:
@@ -37,7 +48,11 @@ resources:
37 name: HostParametersDeployment 48 name: HostParametersDeployment
38 server: {get_param: server} 49 server: {get_param: server}
39 config: {get_resource: HostParametersConfig} 50 config: {get_resource: HostParametersConfig}
40 actions: ['CREATE'] # Only do this on CREATE 51 actions:
52 if:
53 - deployment_actions_empty
54 - []
55 - ['CREATE'] # Only do this on CREATE
41 input_values: 56 input_values:
42 _KERNEL_ARGS_: {get_param: [RoleParameters, KernelArgs]} 57 _KERNEL_ARGS_: {get_param: [RoleParameters, KernelArgs]}
43 _TUNED_PROFILE_NAME_: {get_param: [RoleParameters, TunedProfileName]} 58 _TUNED_PROFILE_NAME_: {get_param: [RoleParameters, TunedProfileName]}
@@ -63,7 +78,11 @@ resources:
63 name: RebootDeployment 78 name: RebootDeployment
64 server: {get_param: server} 79 server: {get_param: server}
65 config: {get_resource: RebootConfig} 80 config: {get_resource: RebootConfig}
66 actions: ['CREATE'] # Only do this on CREATE 81 actions:
82 if:
83 - deployment_actions_empty
84 - []
85 - ['CREATE'] # Only do this on CREATE
67 signal_transport: NO_SIGNAL 86 signal_transport: NO_SIGNAL
68 87
69outputs: 88outputs:
diff --git a/extraconfig/tasks/ssh/host_public_key.yaml b/extraconfig/tasks/ssh/host_public_key.yaml
index e4ba0cc..02fdbf1 100644
--- a/extraconfig/tasks/ssh/host_public_key.yaml
+++ b/extraconfig/tasks/ssh/host_public_key.yaml
@@ -7,6 +7,13 @@ parameters:
7 server: 7 server:
8 description: ID of the node to apply this config to 8 description: ID of the node to apply this config to
9 type: string 9 type: string
10 deployment_actions:
11 default: ['CREATE', 'UPDATE']
12 type: comma_delimited_list
13 description: >
14 List of stack actions that will trigger any deployments in this
15 templates. The actions will be an empty list of the server is in the
16 toplevel DeploymentServerBlacklist parameter's value.
10 17
11resources: 18resources:
12 SshHostPubKeyConfig: 19 SshHostPubKeyConfig:
@@ -28,6 +35,7 @@ resources:
28 properties: 35 properties:
29 config: {get_resource: SshHostPubKeyConfig} 36 config: {get_resource: SshHostPubKeyConfig}
30 server: {get_param: server} 37 server: {get_param: server}
38 actions: {get_param: deployment_actions}
31 39
32 40
33outputs: 41outputs:
diff --git a/puppet/blockstorage-role.yaml b/puppet/blockstorage-role.yaml
index 551a88c..95dcf0b 100644
--- a/puppet/blockstorage-role.yaml
+++ b/puppet/blockstorage-role.yaml
@@ -377,6 +377,7 @@ resources:
377 properties: 377 properties:
378 server: {get_resource: BlockStorage} 378 server: {get_resource: BlockStorage}
379 RoleParameters: {get_param: RoleParameters} 379 RoleParameters: {get_param: RoleParameters}
380 deployment_actions: {get_attr: [DeploymentActions, value]}
380 381
381 NetworkDeployment: 382 NetworkDeployment:
382 type: OS::TripleO::SoftwareDeployment 383 type: OS::TripleO::SoftwareDeployment
@@ -485,6 +486,9 @@ resources:
485 NodeExtraConfig: 486 NodeExtraConfig:
486 depends_on: NodeTLSCAData 487 depends_on: NodeTLSCAData
487 type: OS::TripleO::NodeExtraConfig 488 type: OS::TripleO::NodeExtraConfig
489 # We have to use conditions here so that we don't break backwards
490 # compatibility with templates everywhere
491 condition: server_not_blacklisted
488 properties: 492 properties:
489 server: {get_resource: BlockStorage} 493 server: {get_resource: BlockStorage}
490 494
@@ -507,11 +511,21 @@ resources:
507 - ['CREATE', 'UPDATE'] 511 - ['CREATE', 'UPDATE']
508 - [] 512 - []
509 513
514 DeploymentActions:
515 type: OS::Heat::Value
516 properties:
517 value:
518 if:
519 - server_not_blacklisted
520 - ['CREATE', 'UPDATE']
521 - []
522
510 SshHostPubKey: 523 SshHostPubKey:
511 type: OS::TripleO::Ssh::HostPubKey 524 type: OS::TripleO::Ssh::HostPubKey
512 depends_on: BlockStorageDeployment 525 depends_on: BlockStorageDeployment
513 properties: 526 properties:
514 server: {get_resource: BlockStorage} 527 server: {get_resource: BlockStorage}
528 deployment_actions: {get_attr: [DeploymentActions, value]}
515 529
516outputs: 530outputs:
517 ip_address: 531 ip_address:
diff --git a/puppet/cephstorage-role.yaml b/puppet/cephstorage-role.yaml
index 4336f3e..6674a8a 100644
--- a/puppet/cephstorage-role.yaml
+++ b/puppet/cephstorage-role.yaml
@@ -383,6 +383,7 @@ resources:
383 properties: 383 properties:
384 server: {get_resource: CephStorage} 384 server: {get_resource: CephStorage}
385 RoleParameters: {get_param: RoleParameters} 385 RoleParameters: {get_param: RoleParameters}
386 deployment_actions: {get_attr: [DeploymentActions, value]}
386 387
387 NetworkDeployment: 388 NetworkDeployment:
388 type: OS::TripleO::SoftwareDeployment 389 type: OS::TripleO::SoftwareDeployment
@@ -489,6 +490,9 @@ resources:
489 CephStorageExtraConfigPre: 490 CephStorageExtraConfigPre:
490 depends_on: CephStorageDeployment 491 depends_on: CephStorageDeployment
491 type: OS::TripleO::CephStorageExtraConfigPre 492 type: OS::TripleO::CephStorageExtraConfigPre
493 # We have to use conditions here so that we don't break backwards
494 # compatibility with templates everywhere
495 condition: server_not_blacklisted
492 properties: 496 properties:
493 server: {get_resource: CephStorage} 497 server: {get_resource: CephStorage}
494 498
@@ -497,6 +501,9 @@ resources:
497 NodeExtraConfig: 501 NodeExtraConfig:
498 depends_on: [CephStorageExtraConfigPre, NodeTLSCAData] 502 depends_on: [CephStorageExtraConfigPre, NodeTLSCAData]
499 type: OS::TripleO::NodeExtraConfig 503 type: OS::TripleO::NodeExtraConfig
504 # We have to use conditions here so that we don't break backwards
505 # compatibility with templates everywhere
506 condition: server_not_blacklisted
500 properties: 507 properties:
501 server: {get_resource: CephStorage} 508 server: {get_resource: CephStorage}
502 509
@@ -518,11 +525,21 @@ resources:
518 - ['CREATE', 'UPDATE'] 525 - ['CREATE', 'UPDATE']
519 - [] 526 - []
520 527
528 DeploymentActions:
529 type: OS::Heat::Value
530 properties:
531 value:
532 if:
533 - server_not_blacklisted
534 - ['CREATE', 'UPDATE']
535 - []
536
521 SshHostPubKey: 537 SshHostPubKey:
522 type: OS::TripleO::Ssh::HostPubKey 538 type: OS::TripleO::Ssh::HostPubKey
523 depends_on: CephStorageDeployment 539 depends_on: CephStorageDeployment
524 properties: 540 properties:
525 server: {get_resource: CephStorage} 541 server: {get_resource: CephStorage}
542 deployment_actions: {get_attr: [DeploymentActions, value]}
526 543
527outputs: 544outputs:
528 ip_address: 545 ip_address:
diff --git a/puppet/compute-role.yaml b/puppet/compute-role.yaml
index 7bcee47..37eb98d 100644
--- a/puppet/compute-role.yaml
+++ b/puppet/compute-role.yaml
@@ -386,6 +386,7 @@ resources:
386 properties: 386 properties:
387 server: {get_resource: NovaCompute} 387 server: {get_resource: NovaCompute}
388 RoleParameters: {get_param: RoleParameters} 388 RoleParameters: {get_param: RoleParameters}
389 deployment_actions: {get_attr: [DeploymentActions, value]}
389 390
390 NetworkConfig: 391 NetworkConfig:
391 type: OS::TripleO::Compute::Net::SoftwareConfig 392 type: OS::TripleO::Compute::Net::SoftwareConfig
@@ -512,6 +513,9 @@ resources:
512 ComputeExtraConfigPre: 513 ComputeExtraConfigPre:
513 depends_on: NovaComputeDeployment 514 depends_on: NovaComputeDeployment
514 type: OS::TripleO::ComputeExtraConfigPre 515 type: OS::TripleO::ComputeExtraConfigPre
516 # We have to use conditions here so that we don't break backwards
517 # compatibility with templates everywhere
518 condition: server_not_blacklisted
515 properties: 519 properties:
516 server: {get_resource: NovaCompute} 520 server: {get_resource: NovaCompute}
517 521
@@ -520,6 +524,9 @@ resources:
520 NodeExtraConfig: 524 NodeExtraConfig:
521 depends_on: [ComputeExtraConfigPre, NodeTLSCAData] 525 depends_on: [ComputeExtraConfigPre, NodeTLSCAData]
522 type: OS::TripleO::NodeExtraConfig 526 type: OS::TripleO::NodeExtraConfig
527 # We have to use conditions here so that we don't break backwards
528 # compatibility with templates everywhere
529 condition: server_not_blacklisted
523 properties: 530 properties:
524 server: {get_resource: NovaCompute} 531 server: {get_resource: NovaCompute}
525 532
@@ -542,11 +549,21 @@ resources:
542 update_identifier: 549 update_identifier:
543 get_param: UpdateIdentifier 550 get_param: UpdateIdentifier
544 551
552 DeploymentActions:
553 type: OS::Heat::Value
554 properties:
555 value:
556 if:
557 - server_not_blacklisted
558 - ['CREATE', 'UPDATE']
559 - []
560
545 SshHostPubKey: 561 SshHostPubKey:
546 type: OS::TripleO::Ssh::HostPubKey 562 type: OS::TripleO::Ssh::HostPubKey
547 depends_on: NovaComputeDeployment 563 depends_on: NovaComputeDeployment
548 properties: 564 properties:
549 server: {get_resource: NovaCompute} 565 server: {get_resource: NovaCompute}
566 deployment_actions: {get_attr: [DeploymentActions, value]}
550 567
551outputs: 568outputs:
552 ip_address: 569 ip_address:
diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml
index 6a03265..01f54df 100644
--- a/puppet/controller-role.yaml
+++ b/puppet/controller-role.yaml
@@ -406,6 +406,7 @@ resources:
406 properties: 406 properties:
407 server: {get_resource: Controller} 407 server: {get_resource: Controller}
408 RoleParameters: {get_param: RoleParameters} 408 RoleParameters: {get_param: RoleParameters}
409 deployment_actions: {get_attr: [DeploymentActions, value]}
409 410
410 NetworkConfig: 411 NetworkConfig:
411 type: OS::TripleO::Controller::Net::SoftwareConfig 412 type: OS::TripleO::Controller::Net::SoftwareConfig
@@ -552,6 +553,9 @@ resources:
552 ControllerExtraConfigPre: 553 ControllerExtraConfigPre:
553 depends_on: ControllerDeployment 554 depends_on: ControllerDeployment
554 type: OS::TripleO::ControllerExtraConfigPre 555 type: OS::TripleO::ControllerExtraConfigPre
556 # We have to use conditions here so that we don't break backwards
557 # compatibility with templates everywhere
558 condition: server_not_blacklisted
555 properties: 559 properties:
556 server: {get_resource: Controller} 560 server: {get_resource: Controller}
557 561
@@ -560,6 +564,9 @@ resources:
560 NodeExtraConfig: 564 NodeExtraConfig:
561 depends_on: [ControllerExtraConfigPre, NodeTLSData] 565 depends_on: [ControllerExtraConfigPre, NodeTLSData]
562 type: OS::TripleO::NodeExtraConfig 566 type: OS::TripleO::NodeExtraConfig
567 # We have to use conditions here so that we don't break backwards
568 # compatibility with templates everywhere
569 condition: server_not_blacklisted
563 properties: 570 properties:
564 server: {get_resource: Controller} 571 server: {get_resource: Controller}
565 572
@@ -582,11 +589,21 @@ resources:
582 update_identifier: 589 update_identifier:
583 get_param: UpdateIdentifier 590 get_param: UpdateIdentifier
584 591
592 DeploymentActions:
593 type: OS::Heat::Value
594 properties:
595 value:
596 if:
597 - server_not_blacklisted
598 - ['CREATE', 'UPDATE']
599 - []
600
585 SshHostPubKey: 601 SshHostPubKey:
586 type: OS::TripleO::Ssh::HostPubKey 602 type: OS::TripleO::Ssh::HostPubKey
587 depends_on: ControllerDeployment 603 depends_on: ControllerDeployment
588 properties: 604 properties:
589 server: {get_resource: Controller} 605 server: {get_resource: Controller}
606 deployment_actions: {get_attr: [DeploymentActions, value]}
590 607
591outputs: 608outputs:
592 ip_address: 609 ip_address:
diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml
index 40a5d44..e634842 100644
--- a/puppet/objectstorage-role.yaml
+++ b/puppet/objectstorage-role.yaml
@@ -377,6 +377,7 @@ resources:
377 properties: 377 properties:
378 server: {get_resource: SwiftStorage} 378 server: {get_resource: SwiftStorage}
379 RoleParameters: {get_param: RoleParameters} 379 RoleParameters: {get_param: RoleParameters}
380 deployment_actions: {get_attr: [DeploymentActions, value]}
380 381
381 NetworkDeployment: 382 NetworkDeployment:
382 type: OS::TripleO::SoftwareDeployment 383 type: OS::TripleO::SoftwareDeployment
@@ -485,6 +486,9 @@ resources:
485 NodeExtraConfig: 486 NodeExtraConfig:
486 depends_on: NodeTLSCAData 487 depends_on: NodeTLSCAData
487 type: OS::TripleO::NodeExtraConfig 488 type: OS::TripleO::NodeExtraConfig
489 # We have to use conditions here so that we don't break backwards
490 # compatibility with templates everywhere
491 condition: server_not_blacklisted
488 properties: 492 properties:
489 server: {get_resource: SwiftStorage} 493 server: {get_resource: SwiftStorage}
490 494
@@ -506,11 +510,21 @@ resources:
506 - ['CREATE', 'UPDATE'] 510 - ['CREATE', 'UPDATE']
507 - [] 511 - []
508 512
513 DeploymentActions:
514 type: OS::Heat::Value
515 properties:
516 value:
517 if:
518 - server_not_blacklisted
519 - ['CREATE', 'UPDATE']
520 - []
521
509 SshHostPubKey: 522 SshHostPubKey:
510 type: OS::TripleO::Ssh::HostPubKey 523 type: OS::TripleO::Ssh::HostPubKey
511 depends_on: SwiftStorageHieraDeploy 524 depends_on: SwiftStorageHieraDeploy
512 properties: 525 properties:
513 server: {get_resource: SwiftStorage} 526 server: {get_resource: SwiftStorage}
527 deployment_actions: {get_attr: [DeploymentActions, value]}
514 528
515outputs: 529outputs:
516 ip_address: 530 ip_address:
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index f3b4b6b..4911fbe 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -399,6 +399,7 @@ resources:
399 properties: 399 properties:
400 server: {get_resource: {{role}}} 400 server: {get_resource: {{role}}}
401 RoleParameters: {get_param: RoleParameters} 401 RoleParameters: {get_param: RoleParameters}
402 deployment_actions: {get_attr: [DeploymentActions, value]}
402 403
403 NetworkDeployment: 404 NetworkDeployment:
404 type: OS::TripleO::SoftwareDeployment 405 type: OS::TripleO::SoftwareDeployment
@@ -511,6 +512,9 @@ resources:
511 {{role}}ExtraConfigPre: 512 {{role}}ExtraConfigPre:
512 depends_on: {{role}}Deployment 513 depends_on: {{role}}Deployment
513 type: OS::TripleO::{{role}}ExtraConfigPre 514 type: OS::TripleO::{{role}}ExtraConfigPre
515 # We have to use conditions here so that we don't break backwards
516 # compatibility with templates everywhere
517 condition: server_not_blacklisted
514 properties: 518 properties:
515 server: {get_resource: {{role}}} 519 server: {get_resource: {{role}}}
516 520
@@ -519,6 +523,9 @@ resources:
519 NodeExtraConfig: 523 NodeExtraConfig:
520 depends_on: [{{role}}ExtraConfigPre, NodeTLSCAData] 524 depends_on: [{{role}}ExtraConfigPre, NodeTLSCAData]
521 type: OS::TripleO::NodeExtraConfig 525 type: OS::TripleO::NodeExtraConfig
526 # We have to use conditions here so that we don't break backwards
527 # compatibility with templates everywhere
528 condition: server_not_blacklisted
522 properties: 529 properties:
523 server: {get_resource: {{role}}} 530 server: {get_resource: {{role}}}
524 531
@@ -541,11 +548,21 @@ resources:
541 - ['CREATE', 'UPDATE'] 548 - ['CREATE', 'UPDATE']
542 - [] 549 - []
543 550
551 DeploymentActions:
552 type: OS::Heat::Value
553 properties:
554 value:
555 if:
556 - server_not_blacklisted
557 - ['CREATE', 'UPDATE']
558 - []
559
544 SshHostPubKey: 560 SshHostPubKey:
545 type: OS::TripleO::Ssh::HostPubKey 561 type: OS::TripleO::Ssh::HostPubKey
546 depends_on: {{role}}Deployment 562 depends_on: {{role}}Deployment
547 properties: 563 properties:
548 server: {get_resource: {{role}}} 564 server: {get_resource: {{role}}}
565 deployment_actions: {get_attr: [DeploymentActions, value]}
549 566
550outputs: 567outputs:
551 ip_address: 568 ip_address: