aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud.j2.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-10 07:55:23 +0000
committerGerrit Code Review <review@openstack.org>2016-09-10 07:55:23 +0000
commit9b805f3dcd2b43cc67fbb5277b22d1fce5491daf (patch)
tree757e91e8cd593d4220ff57b0d2629952fd1051dc /overcloud.j2.yaml
parentc90e176bfc51e0b23f775b346cc7cee1b9047ddc (diff)
parentd914f9c5c19680cc0234abcfb33a1467518322fc (diff)
Merge "Move AllNodesDeployments into jinja template loop"
Diffstat (limited to 'overcloud.j2.yaml')
-rw-r--r--overcloud.j2.yaml62
1 files changed, 11 insertions, 51 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index e8abd2c8..16db3797 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -252,7 +252,7 @@ resources:
NetIpMap: {get_attr: [VipMap, net_ip_map]}
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
- # Jinja loop for Role in role_data.yaml
+ # Jinja loop for Role in roles_data.yaml
{% for role in roles %}
# Resources generated for {{role.name}} Role
{{role.name}}ServiceChain:
@@ -263,6 +263,16 @@ resources:
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
DefaultPasswords: {get_attr: [DefaultPasswords, passwords]}
+
+ {{role.name}}AllNodesDeployment:
+ type: OS::Heat::StructuredDeployments
+ properties:
+ name: {{role.name}}AllNodesDeployment
+ config: {get_attr: [allNodesConfig, config_id]}
+ servers: {get_attr: [{{role.name}}, attributes, nova_server_resource]}
+ input_values:
+ bootstrap_nodeid: {get_attr: [{{role.name}}, resource.0.hostname]}
+ bootstrap_nodeid_ip: {get_attr: [{{role.name}}, resource.0.ip_address]}
{% endfor %}
Controller:
@@ -646,56 +656,6 @@ resources:
StorageMgmtIpUri: {get_attr: [StorageMgmtVirtualIP, ip_address_uri]}
# No tenant or management VIP required
- ControllerAllNodesDeployment:
- type: OS::Heat::StructuredDeployments
- properties:
- name: ControllerAllNodesDeployment
- config: {get_attr: [allNodesConfig, config_id]}
- servers: {get_attr: [Controller, attributes, nova_server_resource]}
- input_values:
- bootstrap_nodeid: {get_attr: [Controller, resource.0.hostname]}
- bootstrap_nodeid_ip: {get_attr: [Controller, resource.0.ip_address]}
-
- ComputeAllNodesDeployment:
- type: OS::Heat::StructuredDeployments
- properties:
- name: ComputeAllNodesDeployment
- config: {get_attr: [allNodesConfig, config_id]}
- servers: {get_attr: [Compute, attributes, nova_server_resource]}
- input_values:
- bootstrap_nodeid: {get_attr: [Compute, resource.0.hostname]}
- bootstrap_nodeid_ip: {get_attr: [Compute, resource.0.ip_address]}
-
- BlockStorageAllNodesDeployment:
- type: OS::Heat::StructuredDeployments
- properties:
- name: BlockStorageAllNodesDeployment
- config: {get_attr: [allNodesConfig, config_id]}
- servers: {get_attr: [BlockStorage, attributes, nova_server_resource]}
- input_values:
- bootstrap_nodeid: {get_attr: [BlockStorage, resource.0.hostname]}
- bootstrap_nodeid_ip: {get_attr: [BlockStorage, resource.0.ip_address]}
-
- ObjectStorageAllNodesDeployment:
- type: OS::Heat::StructuredDeployments
- properties:
- name: ObjectStorageAllNodesDeployment
- config: {get_attr: [allNodesConfig, config_id]}
- servers: {get_attr: [ObjectStorage, attributes, nova_server_resource]}
- input_values:
- bootstrap_nodeid: {get_attr: [ObjectStorage, resource.0.hostname]}
- bootstrap_nodeid_ip: {get_attr: [ObjectStorage, resource.0.ip_address]}
-
- CephStorageAllNodesDeployment:
- type: OS::Heat::StructuredDeployments
- properties:
- name: CephStorageAllNodesDeployment
- config: {get_attr: [allNodesConfig, config_id]}
- servers: {get_attr: [CephStorage, attributes, nova_server_resource]}
- input_values:
- bootstrap_nodeid: {get_attr: [CephStorage, resource.0.hostname]}
- bootstrap_nodeid_ip: {get_attr: [CephStorage, resource.0.ip_address]}
-
# All Nodes Validations
AllNodesValidationConfig:
type: OS::TripleO::AllNodes::Validation