summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-26 12:39:33 +0000
committerGerrit Code Review <review@openstack.org>2015-05-26 12:39:33 +0000
commit5c8576f4556a2ffdd2d8582d77daaa56d7138c72 (patch)
treea758364c9a8d051988942ef89d01ce69f3a64474
parent631b1afee180317e4eca5980e82238265f1a7049 (diff)
parenta4fd6b70b41c330f4d12da534b8a5ed92413329e (diff)
Merge "Wire in optional network creation for overcloud"
-rw-r--r--overcloud-resource-registry-puppet.yaml9
-rw-r--r--overcloud-resource-registry.yaml9
-rw-r--r--overcloud-without-mergepy.yaml11
3 files changed, 29 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index 744e115f..d1c924e9 100644
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -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
diff --git a/overcloud-resource-registry.yaml b/overcloud-resource-registry.yaml
index 69266405..472f4b94 100644
--- a/overcloud-resource-registry.yaml
+++ b/overcloud-resource-registry.yaml
@@ -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
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 50176968..b7ef0869 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -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}