Merge "Wire in optional network creation for overcloud"
This commit is contained in:
commit
5c8576f455
|
@ -24,5 +24,14 @@ resource_registry:
|
||||||
OS::TripleO::NodeUserData: firstboot/userdata_default.yaml
|
OS::TripleO::NodeUserData: firstboot/userdata_default.yaml
|
||||||
OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml
|
OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml
|
||||||
|
|
||||||
|
# TripleO overcloud networks
|
||||||
|
OS::TripleO::Network: network/networks.yaml
|
||||||
|
|
||||||
|
OS::TripleO::Network::External: network/noop.yaml
|
||||||
|
OS::TripleO::Network::InternalApi: network/noop.yaml
|
||||||
|
OS::TripleO::Network::StorageMgmt: network/noop.yaml
|
||||||
|
OS::TripleO::Network::Storage: network/noop.yaml
|
||||||
|
OS::TripleO::Network::Tenant: network/noop.yaml
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
EnablePackageInstall: false
|
EnablePackageInstall: false
|
||||||
|
|
|
@ -21,3 +21,12 @@ resource_registry:
|
||||||
OS::TripleO::BootstrapNode::SoftwareConfig: bootstrap-config.yaml
|
OS::TripleO::BootstrapNode::SoftwareConfig: bootstrap-config.yaml
|
||||||
OS::TripleO::NodeUserData: firstboot/userdata_default.yaml
|
OS::TripleO::NodeUserData: firstboot/userdata_default.yaml
|
||||||
OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml
|
OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml
|
||||||
|
|
||||||
|
# TripleO overcloud networks
|
||||||
|
OS::TripleO::Network: network/networks.yaml
|
||||||
|
|
||||||
|
OS::TripleO::Network::External: network/noop.yaml
|
||||||
|
OS::TripleO::Network::InternalApi: network/noop.yaml
|
||||||
|
OS::TripleO::Network::StorageMgmt: network/noop.yaml
|
||||||
|
OS::TripleO::Network::Storage: network/noop.yaml
|
||||||
|
OS::TripleO::Network::Tenant: network/noop.yaml
|
||||||
|
|
|
@ -552,6 +552,7 @@ resources:
|
||||||
|
|
||||||
Controller:
|
Controller:
|
||||||
type: OS::Heat::ResourceGroup
|
type: OS::Heat::ResourceGroup
|
||||||
|
depends_on: Networks
|
||||||
properties:
|
properties:
|
||||||
count: {get_param: ControllerCount}
|
count: {get_param: ControllerCount}
|
||||||
resource_def:
|
resource_def:
|
||||||
|
@ -640,6 +641,7 @@ resources:
|
||||||
|
|
||||||
Compute:
|
Compute:
|
||||||
type: OS::Heat::ResourceGroup
|
type: OS::Heat::ResourceGroup
|
||||||
|
depends_on: Networks
|
||||||
properties:
|
properties:
|
||||||
count: {get_param: ComputeCount}
|
count: {get_param: ComputeCount}
|
||||||
resource_def:
|
resource_def:
|
||||||
|
@ -695,6 +697,7 @@ resources:
|
||||||
|
|
||||||
BlockStorage:
|
BlockStorage:
|
||||||
type: OS::Heat::ResourceGroup
|
type: OS::Heat::ResourceGroup
|
||||||
|
depends_on: Networks
|
||||||
properties:
|
properties:
|
||||||
count: {get_param: BlockStorageCount}
|
count: {get_param: BlockStorageCount}
|
||||||
resource_def:
|
resource_def:
|
||||||
|
@ -717,6 +720,7 @@ resources:
|
||||||
|
|
||||||
ObjectStorage:
|
ObjectStorage:
|
||||||
type: OS::Heat::ResourceGroup
|
type: OS::Heat::ResourceGroup
|
||||||
|
depends_on: Networks
|
||||||
properties:
|
properties:
|
||||||
count: {get_param: ObjectStorageCount}
|
count: {get_param: ObjectStorageCount}
|
||||||
resource_def:
|
resource_def:
|
||||||
|
@ -734,6 +738,7 @@ resources:
|
||||||
|
|
||||||
CephStorage:
|
CephStorage:
|
||||||
type: OS::Heat::ResourceGroup
|
type: OS::Heat::ResourceGroup
|
||||||
|
depends_on: Networks
|
||||||
properties:
|
properties:
|
||||||
count: {get_param: CephStorageCount}
|
count: {get_param: CephStorageCount}
|
||||||
resource_def:
|
resource_def:
|
||||||
|
@ -771,8 +776,13 @@ resources:
|
||||||
length: 20
|
length: 20
|
||||||
salt: {get_param: RabbitCookieSalt}
|
salt: {get_param: RabbitCookieSalt}
|
||||||
|
|
||||||
|
# creates the network architecture
|
||||||
|
Networks:
|
||||||
|
type: OS::TripleO::Network
|
||||||
|
|
||||||
ControlVirtualIP:
|
ControlVirtualIP:
|
||||||
type: OS::Neutron::Port
|
type: OS::Neutron::Port
|
||||||
|
depends_on: Networks
|
||||||
properties:
|
properties:
|
||||||
name: control_virtual_ip
|
name: control_virtual_ip
|
||||||
network_id: {get_param: NeutronControlPlaneID}
|
network_id: {get_param: NeutronControlPlaneID}
|
||||||
|
@ -781,6 +791,7 @@ resources:
|
||||||
|
|
||||||
PublicVirtualIP:
|
PublicVirtualIP:
|
||||||
type: OS::Neutron::Port
|
type: OS::Neutron::Port
|
||||||
|
depends_on: Networks
|
||||||
properties:
|
properties:
|
||||||
name: public_virtual_ip
|
name: public_virtual_ip
|
||||||
network: {get_param: PublicVirtualNetwork}
|
network: {get_param: PublicVirtualNetwork}
|
||||||
|
|
Loading…
Reference in New Issue