Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Deploy ironic-api with WSGI"
[apex-tripleo-heat-templates.git]
/
puppet
/
blockstorage-role.yaml
diff --git
a/puppet/blockstorage-role.yaml
b/puppet/blockstorage-role.yaml
index
08bc03a
..
95dcf0b
100644
(file)
--- a/
puppet/blockstorage-role.yaml
+++ b/
puppet/blockstorage-role.yaml
@@
-69,8
+69,8
@@
parameters:
default: 'localdomain'
type: string
description: >
default: 'localdomain'
type: string
description: >
- The DNS domain used for the hosts. This
should match the dhcp_domain
-
configured in the Undercloud neutron. Defaults to localdomain
.
+ The DNS domain used for the hosts. This
must match the
+
overcloud_domain_name configured on the undercloud
.
BlockStorageServerMetadata:
default: {}
description: >
BlockStorageServerMetadata:
default: {}
description: >
@@
-377,6
+377,7
@@
resources:
properties:
server: {get_resource: BlockStorage}
RoleParameters: {get_param: RoleParameters}
properties:
server: {get_resource: BlockStorage}
RoleParameters: {get_param: RoleParameters}
+ deployment_actions: {get_attr: [DeploymentActions, value]}
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
@@
-485,6
+486,9
@@
resources:
NodeExtraConfig:
depends_on: NodeTLSCAData
type: OS::TripleO::NodeExtraConfig
NodeExtraConfig:
depends_on: 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: BlockStorage}
properties:
server: {get_resource: BlockStorage}
@@
-507,11
+511,21
@@
resources:
- ['CREATE', 'UPDATE']
- []
- ['CREATE', 'UPDATE']
- []
+ DeploymentActions:
+ type: OS::Heat::Value
+ properties:
+ value:
+ if:
+ - server_not_blacklisted
+ - ['CREATE', 'UPDATE']
+ - []
+
SshHostPubKey:
type: OS::TripleO::Ssh::HostPubKey
depends_on: BlockStorageDeployment
properties:
server: {get_resource: BlockStorage}
SshHostPubKey:
type: OS::TripleO::Ssh::HostPubKey
depends_on: BlockStorageDeployment
properties:
server: {get_resource: BlockStorage}
+ deployment_actions: {get_attr: [DeploymentActions, value]}
outputs:
ip_address:
outputs:
ip_address: