Merge "Combine BootstrapNodeDeployment with AllNodesDeployment"
This commit is contained in:
commit
a6648b2cfb
|
@ -20,7 +20,6 @@ resource_registry:
|
||||||
OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig: puppet/swift-devices-and-proxy-config.yaml
|
OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig: puppet/swift-devices-and-proxy-config.yaml
|
||||||
OS::TripleO::CephClusterConfig::SoftwareConfig: puppet/ceph-cluster-config.yaml
|
OS::TripleO::CephClusterConfig::SoftwareConfig: puppet/ceph-cluster-config.yaml
|
||||||
OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml
|
OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml
|
||||||
OS::TripleO::BootstrapNode::SoftwareConfig: puppet/bootstrap-config.yaml
|
|
||||||
|
|
||||||
# Tasks (for internal TripleO usage)
|
# Tasks (for internal TripleO usage)
|
||||||
OS::TripleO::Tasks::UpdateWorkflow: OS::Heat::None
|
OS::TripleO::Tasks::UpdateWorkflow: OS::Heat::None
|
||||||
|
|
|
@ -1087,19 +1087,6 @@ resources:
|
||||||
storage_virtual_ip: {get_attr: [VipMap, net_ip_map, storage]}
|
storage_virtual_ip: {get_attr: [VipMap, net_ip_map, storage]}
|
||||||
storage_mgmt_virtual_ip: {get_attr: [VipMap, net_ip_map, storage_mgmt]}
|
storage_mgmt_virtual_ip: {get_attr: [VipMap, net_ip_map, storage_mgmt]}
|
||||||
|
|
||||||
ControllerBootstrapNodeConfig:
|
|
||||||
type: OS::TripleO::BootstrapNode::SoftwareConfig
|
|
||||||
properties:
|
|
||||||
bootstrap_nodeid: {get_attr: [Controller, resource.0.hostname]}
|
|
||||||
bootstrap_nodeid_ip: {get_attr: [Controller, resource.0.ip_address]}
|
|
||||||
|
|
||||||
ControllerBootstrapNodeDeployment:
|
|
||||||
type: OS::Heat::StructuredDeployments
|
|
||||||
properties:
|
|
||||||
name: ControllerBootstrapNodeDeployment
|
|
||||||
config: {get_attr: [ControllerBootstrapNodeConfig, config_id]}
|
|
||||||
servers: {get_attr: [Controller, attributes, nova_server_resource]}
|
|
||||||
|
|
||||||
ControllerSwiftDeployment:
|
ControllerSwiftDeployment:
|
||||||
type: OS::Heat::StructuredDeployments
|
type: OS::Heat::StructuredDeployments
|
||||||
properties:
|
properties:
|
||||||
|
@ -1151,6 +1138,9 @@ resources:
|
||||||
name: ControllerAllNodesDeployment
|
name: ControllerAllNodesDeployment
|
||||||
config: {get_attr: [allNodesConfig, config_id]}
|
config: {get_attr: [allNodesConfig, config_id]}
|
||||||
servers: {get_attr: [Controller, attributes, nova_server_resource]}
|
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:
|
ComputeAllNodesDeployment:
|
||||||
type: OS::Heat::StructuredDeployments
|
type: OS::Heat::StructuredDeployments
|
||||||
|
@ -1158,6 +1148,9 @@ resources:
|
||||||
name: ComputeAllNodesDeployment
|
name: ComputeAllNodesDeployment
|
||||||
config: {get_attr: [allNodesConfig, config_id]}
|
config: {get_attr: [allNodesConfig, config_id]}
|
||||||
servers: {get_attr: [Compute, attributes, nova_server_resource]}
|
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:
|
BlockStorageAllNodesDeployment:
|
||||||
type: OS::Heat::StructuredDeployments
|
type: OS::Heat::StructuredDeployments
|
||||||
|
@ -1165,6 +1158,9 @@ resources:
|
||||||
name: BlockStorageAllNodesDeployment
|
name: BlockStorageAllNodesDeployment
|
||||||
config: {get_attr: [allNodesConfig, config_id]}
|
config: {get_attr: [allNodesConfig, config_id]}
|
||||||
servers: {get_attr: [BlockStorage, attributes, nova_server_resource]}
|
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:
|
ObjectStorageAllNodesDeployment:
|
||||||
type: OS::Heat::StructuredDeployments
|
type: OS::Heat::StructuredDeployments
|
||||||
|
@ -1172,6 +1168,9 @@ resources:
|
||||||
name: ObjectStorageAllNodesDeployment
|
name: ObjectStorageAllNodesDeployment
|
||||||
config: {get_attr: [allNodesConfig, config_id]}
|
config: {get_attr: [allNodesConfig, config_id]}
|
||||||
servers: {get_attr: [ObjectStorage, attributes, nova_server_resource]}
|
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:
|
CephStorageAllNodesDeployment:
|
||||||
type: OS::Heat::StructuredDeployments
|
type: OS::Heat::StructuredDeployments
|
||||||
|
@ -1179,6 +1178,9 @@ resources:
|
||||||
name: CephStorageAllNodesDeployment
|
name: CephStorageAllNodesDeployment
|
||||||
config: {get_attr: [allNodesConfig, config_id]}
|
config: {get_attr: [allNodesConfig, config_id]}
|
||||||
servers: {get_attr: [CephStorage, attributes, nova_server_resource]}
|
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
|
# All Nodes Validations
|
||||||
AllNodesValidationConfig:
|
AllNodesValidationConfig:
|
||||||
|
@ -1266,7 +1268,7 @@ resources:
|
||||||
# Nested stack deployment runs after all other controller deployments
|
# Nested stack deployment runs after all other controller deployments
|
||||||
ControllerNodesPostDeployment:
|
ControllerNodesPostDeployment:
|
||||||
type: OS::TripleO::ControllerPostDeployment
|
type: OS::TripleO::ControllerPostDeployment
|
||||||
depends_on: [ControllerBootstrapNodeDeployment, ControllerAllNodesDeployment, ControllerSwiftDeployment, ControllerCephDeployment]
|
depends_on: [ControllerAllNodesDeployment, ControllerSwiftDeployment, ControllerCephDeployment]
|
||||||
properties:
|
properties:
|
||||||
servers: {get_attr: [Controller, attributes, nova_server_resource]}
|
servers: {get_attr: [Controller, attributes, nova_server_resource]}
|
||||||
RoleData: {get_attr: [ControllerServiceChain, role_data]}
|
RoleData: {get_attr: [ControllerServiceChain, role_data]}
|
||||||
|
|
|
@ -108,6 +108,10 @@ resources:
|
||||||
datafiles:
|
datafiles:
|
||||||
RedHat:
|
RedHat:
|
||||||
raw_data: {get_file: hieradata/RedHat.yaml}
|
raw_data: {get_file: hieradata/RedHat.yaml}
|
||||||
|
bootstrap_node:
|
||||||
|
mapped_data:
|
||||||
|
bootstrap_nodeid: {get_input: bootstrap_nodeid}
|
||||||
|
bootstrap_nodeid_ip: {get_input: bootstrap_nodeid_ip}
|
||||||
all_nodes:
|
all_nodes:
|
||||||
mapped_data:
|
mapped_data:
|
||||||
controller_node_ips:
|
controller_node_ips:
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
heat_template_version: 2015-04-30
|
|
||||||
description: 'Bootstrap Config Puppet'
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
bootstrap_nodeid:
|
|
||||||
type: string
|
|
||||||
bootstrap_nodeid_ip:
|
|
||||||
type: string
|
|
||||||
|
|
||||||
resources:
|
|
||||||
|
|
||||||
BootstrapNodeConfigImpl:
|
|
||||||
type: OS::Heat::StructuredConfig
|
|
||||||
properties:
|
|
||||||
group: os-apply-config
|
|
||||||
config:
|
|
||||||
hiera:
|
|
||||||
datafiles:
|
|
||||||
bootstrap_node:
|
|
||||||
mapped_data:
|
|
||||||
bootstrap_nodeid: {get_param: bootstrap_nodeid}
|
|
||||||
bootstrap_nodeid_ip: {get_param: bootstrap_nodeid_ip}
|
|
||||||
|
|
||||||
outputs:
|
|
||||||
config_id:
|
|
||||||
description: The ID of the BootstrapNodeConfigImpl resource.
|
|
||||||
value:
|
|
||||||
{get_resource: BootstrapNodeConfigImpl}
|
|
|
@ -312,6 +312,12 @@ resources:
|
||||||
get_param: UpdateIdentifier
|
get_param: UpdateIdentifier
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
|
ip_address:
|
||||||
|
description: IP address of the server in the ctlplane network
|
||||||
|
value: {get_attr: [CephStorage, networks, ctlplane, 0]}
|
||||||
|
hostname:
|
||||||
|
description: Hostname of the server
|
||||||
|
value: {get_attr: [CephStorage, name]}
|
||||||
hosts_entry:
|
hosts_entry:
|
||||||
value:
|
value:
|
||||||
str_replace:
|
str_replace:
|
||||||
|
|
|
@ -313,6 +313,12 @@ resources:
|
||||||
get_param: UpdateIdentifier
|
get_param: UpdateIdentifier
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
|
ip_address:
|
||||||
|
description: IP address of the server in the ctlplane network
|
||||||
|
value: {get_attr: [BlockStorage, networks, ctlplane, 0]}
|
||||||
|
hostname:
|
||||||
|
description: Hostname of the server
|
||||||
|
value: {get_attr: [BlockStorage, name]}
|
||||||
hosts_entry:
|
hosts_entry:
|
||||||
value:
|
value:
|
||||||
str_replace:
|
str_replace:
|
||||||
|
|
|
@ -340,6 +340,12 @@ resources:
|
||||||
get_param: UpdateIdentifier
|
get_param: UpdateIdentifier
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
|
ip_address:
|
||||||
|
description: IP address of the server in the ctlplane network
|
||||||
|
value: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
|
||||||
|
hostname:
|
||||||
|
description: Hostname of the server
|
||||||
|
value: {get_attr: [SwiftStorage, name]}
|
||||||
hosts_entry:
|
hosts_entry:
|
||||||
value:
|
value:
|
||||||
str_replace:
|
str_replace:
|
||||||
|
|
Loading…
Reference in New Issue