openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Wire in optional network creation for overcloud"

This commit is contained in:
Jenkins 2015-05-26 12:39:33 +00:00 committed by Gerrit Code Review
parent 631b1afee1 a4fd6b70b4
commit 5c8576f455
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
overcloud-resource-registry-puppet.yaml
View File

@ -24,5 +24,14 @@ resource_registry:
OS::TripleO::NodeUserData: firstboot/userdata_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:
EnablePackageInstall: false

9
overcloud-resource-registry.yaml
View File

@ -21,3 +21,12 @@ resource_registry:
OS::TripleO::BootstrapNode::SoftwareConfig: bootstrap-config.yaml
OS::TripleO::NodeUserData: firstboot/userdata_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

11
overcloud-without-mergepy.yaml
View File

@ -552,6 +552,7 @@ resources:
Controller:
type: OS::Heat::ResourceGroup
depends_on: Networks
properties:
count: {get_param: ControllerCount}
resource_def:
@ -640,6 +641,7 @@ resources:
Compute:
type: OS::Heat::ResourceGroup
depends_on: Networks
properties:
count: {get_param: ComputeCount}
resource_def:
@ -695,6 +697,7 @@ resources:
BlockStorage:
type: OS::Heat::ResourceGroup
depends_on: Networks
properties:
count: {get_param: BlockStorageCount}
resource_def:
@ -717,6 +720,7 @@ resources:
ObjectStorage:
type: OS::Heat::ResourceGroup
depends_on: Networks
properties:
count: {get_param: ObjectStorageCount}
resource_def:
@ -734,6 +738,7 @@ resources:
CephStorage:
type: OS::Heat::ResourceGroup
depends_on: Networks
properties:
count: {get_param: CephStorageCount}
resource_def:
@ -771,8 +776,13 @@ resources:
length: 20
salt: {get_param: RabbitCookieSalt}
# creates the network architecture
Networks:
type: OS::TripleO::Network
ControlVirtualIP:
type: OS::Neutron::Port
depends_on: Networks
properties:
name: control_virtual_ip
network_id: {get_param: NeutronControlPlaneID}
@ -781,6 +791,7 @@ resources:
PublicVirtualIP:
type: OS::Neutron::Port
depends_on: Networks
properties:
name: public_virtual_ip
network: {get_param: PublicVirtualNetwork}