aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-30 12:30:55 +0000
committerGerrit Code Review <review@openstack.org>2016-06-30 12:30:55 +0000
commit66b9735f42c7ff774c3b8d54a26c95c05a3ad2b4 (patch)
tree461972e50d35b50c08461342d14c737635ded544
parent44525fca3aa46aa0fc59e1a44afc2ed098208cc7 (diff)
parent8a584a757b1cacc33794180389ec029a7921648b (diff)
Merge "Add Management net to ips-from-pool-all example"
-rw-r--r--environments/ips-from-pool-all.yaml16
1 files changed, 16 insertions, 0 deletions
diff --git a/environments/ips-from-pool-all.yaml b/environments/ips-from-pool-all.yaml
index f660d501..87563753 100644
--- a/environments/ips-from-pool-all.yaml
+++ b/environments/ips-from-pool-all.yaml
@@ -5,30 +5,36 @@ resource_registry:
OS::TripleO::Controller::Ports::StoragePort: ../network/ports/storage_from_pool.yaml
OS::TripleO::Controller::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_from_pool.yaml
OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant_from_pool.yaml
+ # Management network is optional and disabled by default
+ #OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
OS::TripleO::Compute::Ports::ExternalPort: ../network/ports/noop.yaml
OS::TripleO::Compute::Ports::InternalApiPort: ../network/ports/internal_api_from_pool.yaml
OS::TripleO::Compute::Ports::StoragePort: ../network/ports/storage_from_pool.yaml
OS::TripleO::Compute::Ports::StorageMgmtPort: ../network/ports/noop.yaml
OS::TripleO::Compute::Ports::TenantPort: ../network/ports/tenant_from_pool.yaml
+ #OS::TripleO::Compute::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
OS::TripleO::CephStorage::Ports::ExternalPort: ../network/ports/noop.yaml
OS::TripleO::CephStorage::Ports::InternalApiPort: ../network/ports/noop.yaml
OS::TripleO::CephStorage::Ports::StoragePort: ../network/ports/storage_from_pool.yaml
OS::TripleO::CephStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_from_pool.yaml
OS::TripleO::CephStorage::Ports::TenantPort: ../network/ports/noop.yaml
+ #OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
OS::TripleO::SwiftStorage::Ports::ExternalPort: ../network/ports/noop.yaml
OS::TripleO::SwiftStorage::Ports::InternalApiPort: ../network/ports/internal_api_from_pool.yaml
OS::TripleO::SwiftStorage::Ports::StoragePort: ../network/ports/storage_from_pool.yaml
OS::TripleO::SwiftStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_from_pool.yaml
OS::TripleO::SwiftStorage::Ports::TenantPort: ../network/ports/noop.yaml
+ #OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
OS::TripleO::BlockStorage::Ports::ExternalPort: ../network/ports/noop.yaml
OS::TripleO::BlockStorage::Ports::InternalApiPort: ../network/ports/internal_api_from_pool.yaml
OS::TripleO::BlockStorage::Ports::StoragePort: ../network/ports/storage_from_pool.yaml
OS::TripleO::BlockStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_from_pool.yaml
OS::TripleO::BlockStorage::Ports::TenantPort: ../network/ports/noop.yaml
+ #OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
parameter_defaults:
ControllerIPs:
@@ -43,6 +49,8 @@ parameter_defaults:
- 172.16.3.251
tenant:
- 172.16.0.251
+ #management:
+ #- 172.16.4.251
NovaComputeIPs:
# Each compute will get an IP from the lists below, first compute, first IP
internal_api:
@@ -51,12 +59,16 @@ parameter_defaults:
- 172.16.1.252
tenant:
- 172.16.0.252
+ #management:
+ #- 172.16.4.252
CephStorageIPs:
# Each ceph node will get an IP from the lists below, first node, first IP
storage:
- 172.16.1.253
storage_mgmt:
- 172.16.3.253
+ #management:
+ #- 172.16.4.253
SwiftStorageIPs:
# Each swift node will get an IP from the lists below, first node, first IP
internal_api:
@@ -65,6 +77,8 @@ parameter_defaults:
- 172.16.1.254
storage_mgmt:
- 172.16.3.254
+ #management:
+ #- 172.16.4.254
BlockStorageIPs:
# Each cinder node will get an IP from the lists below, first node, first IP
internal_api:
@@ -73,3 +87,5 @@ parameter_defaults:
- 172.16.1.250
storage_mgmt:
- 172.16.3.250
+ #management:
+ #- 172.16.4.250