diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-13 04:08:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-13 04:08:30 +0000 |
| commit | 7d07abf68281dad3edf5e23b66f0ed62f2f353d9 (patch) | |
| tree | 869a658f49090eb05934a7456f8a65f58f03c106 /puppet/objectstorage-role.yaml | |
| parent | 3a20d3f0c22663a9bb6d6fc2795adc8cc1d3939b (diff) | |
| parent | 11b3cb25a9884d8eaed0544a5ef2862e4a046652 (diff) | |
Merge "Revert "Revert "Blacklist support for ExtraConfig"""
Diffstat (limited to 'puppet/objectstorage-role.yaml')
| -rw-r--r-- | puppet/objectstorage-role.yaml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml index 6b9618de..a03a9da5 100644 --- a/puppet/objectstorage-role.yaml +++ b/puppet/objectstorage-role.yaml @@ -409,6 +409,7 @@ resources: server: {get_resource: SwiftStorage} RoleParameters: {get_param: RoleParameters} ServiceNames: {get_param: ServiceNames} + deployment_actions: {get_attr: [DeploymentActions, value]} NetworkDeployment: type: OS::TripleO::SoftwareDeployment @@ -517,6 +518,9 @@ resources: 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: SwiftStorage} @@ -538,11 +542,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: SwiftStorageHieraDeploy properties: server: {get_resource: SwiftStorage} + deployment_actions: {get_attr: [DeploymentActions, value]} outputs: ip_address: |