openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Change OS::Heat::*Deployments to OS::Heat:*DeploymentGroup 

Those are hidden resource types in heat. Changing these types
would not result in replacement of the resources.

Change-Id: I22d23a8f187263bd36e364f0cd3301c830f3220b
This commit is contained in:
Rabi Mishra 2019-07-04 20:15:41 +05:30
parent 250e172f29
commit 39a5545c41
8 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extraconfig/all_nodes/mac_hostname.j2.yaml
View File

@ -31,7 +31,7 @@ resources:
# deployment instead of requiring one deployment per-role.
{% for role in roles %}
CollectMacDeployments{{role.name}}:
type: OS::Heat::SoftwareDeployments
type: OS::Heat::SoftwareDeploymentGroup
properties:
name: CollectMacDeploymentsController
servers: {get_param: [servers, {{role.name}}]}
@ -60,7 +60,7 @@ resources:
echo "mappings = $(cat /root/*_mappings)"
DistributeMacDeploymentsController:
type: OS::Heat::SoftwareDeployments
type: OS::Heat::SoftwareDeploymentGroup
properties:
name: DistributeMacDeploymentsController
servers: {get_param: [servers, Controller]}

4
extraconfig/all_nodes/random_string.j2.yaml
View File

@ -31,7 +31,7 @@ resources:
echo $random_value > /root/random_value
RandomDeploymentsController:
type: OS::Heat::SoftwareDeployments
type: OS::Heat::SoftwareDeploymentGroup
properties:
name: RandomDeploymentsController
servers: {get_param: [servers, Controller]}
@ -41,7 +41,7 @@ resources:
random_value: {get_attr: [Random, value]}
RandomDeploymentsCompute:
type: OS::Heat::SoftwareDeployments
type: OS::Heat::SoftwareDeploymentGroup
properties:
name: RandomDeploymentsCompute
servers: {get_param: [servers, Compute]}

2
extraconfig/post_deploy/example.yaml
View File

@ -20,7 +20,7 @@ resources:
echo "extra" > /root/extra
ExtraDeployments:
type: OS::Heat::SoftwareDeployments
type: OS::Heat::SoftwareDeploymentGroup
properties:
name: ExtraDeployments
servers: {get_param: servers}

2
extraconfig/post_deploy/example_run_on_update.yaml
View File

@ -31,7 +31,7 @@ resources:
echo "extra_update $deploy_identifier" >> /root/extra_update
ExtraDeployments:
type: OS::Heat::SoftwareDeployments
type: OS::Heat::SoftwareDeploymentGroup
properties:
name: ExtraDeployments
servers: {get_param: servers}

4
extraconfig/post_deploy/standalone_post.yaml
View File

@ -59,7 +59,7 @@ resources:
force: yes
StandalonePostDeployment:
type: OS::Heat::SoftwareDeployments
type: OS::Heat::SoftwareDeploymentGroup
properties:
name: StandalonePostDeployment
servers: {get_param: servers}
@ -83,7 +83,7 @@ resources:
config: {get_file: ./clouds_yaml.py}
CloudsYamlDeployment:
type: OS::Heat::SoftwareDeployments
type: OS::Heat::SoftwareDeploymentGroup
properties:
name: CloudsYamlDeployment
servers: {get_param: servers}

8
extraconfig/post_deploy/undercloud_post.yaml
View File

@ -120,7 +120,7 @@ resources:
config: {get_file: ./undercloud_post.sh}
UndercloudPostDeployment:
type: OS::Heat::SoftwareDeployments
type: OS::Heat::SoftwareDeploymentGroup
properties:
name: UndercloudPostDeployment
servers: {get_param: servers}
@ -155,7 +155,7 @@ resources:
config: {get_file: ./clouds_yaml.py}
CloudsYamlDeployment:
type: OS::Heat::SoftwareDeployments
type: OS::Heat::SoftwareDeploymentGroup
properties:
name: CloudsYamlDeployment
servers: {get_param: servers}
@ -181,7 +181,7 @@ resources:
config: {get_file: ./undercloud_post.py}
UndercloudPostPyDeployment:
type: OS::Heat::SoftwareDeployments
type: OS::Heat::SoftwareDeploymentGroup
depends_on: [UndercloudPostDeployment, CloudsYamlDeployment]
properties:
name: UndercloudPostPyDeployment
@ -208,7 +208,7 @@ resources:
config: {get_file: ./undercloud_ctlplane_network.py}
UndercloudCtlplaneNetworkDeployment:
type: OS::Heat::SoftwareDeployments
type: OS::Heat::SoftwareDeploymentGroup
depends_on: [UndercloudPostDeployment, CloudsYamlDeployment]
properties:
name: UndercloudCtlplaneNetworkDeployment

4
puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.j2.yaml
View File

@ -110,7 +110,7 @@ resources:
neutron::plugins::ml2::cisco::type_nexus_vxlan::mcast_ranges: {get_input: NexusVxlanMcastRanges}
NetworkCiscoDeployment:
type: OS::Heat::StructuredDeployments
type: OS::Heat::StructuredDeploymentGroup
properties:
name: NetworkCiscoDeployment
config: {get_resource: NetworkCiscoConfig}
@ -156,7 +156,7 @@ resources:
{% for role in roles %}
CollectMacDeployments{{role.name}}:
type: OS::Heat::SoftwareDeployments
type: OS::Heat::SoftwareDeploymentGroup
properties:
name: CollectMacDeployments{{role.name}}
servers: {get_param: [servers, {{role.name}}]}

2
tools/yaml-validate.py
View File

@ -244,8 +244,6 @@ VALIDATE_DOCKER_OVERRIDE = {
DEPLOYMENT_RESOURCE_TYPES = [
'OS::Heat::SoftwareDeploymentGroup',
'OS::Heat::StructuredDeploymentGroup',
'OS::Heat::StructuredDeployments',
'OS::Heat::SoftwareDeployments',
'OS::Heat::SoftwareDeployment',
'OS::Heat::StructuredDeployment',
'OS::TripleO::SoftwareDeployment'