diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-01-11 15:52:48 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-01-12 23:40:21 -0500 |
| commit | e8231a61f36ce55465890d681fe1c1dfcbd5b6e9 (patch) | |
| tree | 94587d0ab82e45ad30307190e8fb544f013093f4 /build/network-environment.yaml | |
| parent | 85485bca140826c2302b5c5a789de9328c3caec8 (diff) | |
Enables private and storage networks
Fixes issues with common-functions:
- ipcalc in epel is old and does not support HOSTMIN,HOSTMAX. Now
BROADCAST and NETWORK values used to find first and last IP in
subnet.
- fixes to auto-generation where values conflicted for IP ranges
- provisioner_ip now generated correctly
Change-Id: I03c7f841d2e1edb1a50041f53970318b6a718cd9
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/network-environment.yaml')
| -rw-r--r-- | build/network-environment.yaml | 65 |
1 files changed, 35 insertions, 30 deletions
diff --git a/build/network-environment.yaml b/build/network-environment.yaml index a42a54bb..01eb50ee 100644 --- a/build/network-environment.yaml +++ b/build/network-environment.yaml @@ -37,34 +37,39 @@ parameter_defaults: ExternalInterfaceDefaultRoute: 192.168.37.1 EC2MetadataIp: 192.0.2.1 DnsServers: ["8.8.8.8","8.8.4.4"] + TenantNetCidr: 172.17.0.0/24 + TenantAllocationPools: [{'start': '172.17.0.10', 'end': '172.17.0.200'}] + StorageNetCidr: 172.18.0.0/24 + StorageAllocationPools: [{'start': '172.18.0.10', 'end': '172.18.0.200'}] -# ServiceNetMap: -# NeutronTenantNetwork: tenant -# CeilometerApiNetwork: internal_api -# MongoDbNetwork: internal_api -# CinderApiNetwork: internal_api -# CinderIscsiNetwork: storage -# GlanceApiNetwork: storage -# GlanceRegistryNetwork: internal_api -# KeystoneAdminApiNetwork: internal_api -# KeystonePublicApiNetwork: internal_api -# NeutronApiNetwork: internal_api -# HeatApiNetwork: internal_api -# NovaApiNetwork: internal_api -# NovaMetadataNetwork: internal_api -# NovaVncProxyNetwork: internal_api -# SwiftMgmtNetwork: storage_mgmt -# SwiftProxyNetwork: storage -# HorizonNetwork: internal_api -# MemcachedNetwork: internal_api -# RabbitMqNetwork: internal_api -# RedisNetwork: internal_api -# MysqlNetwork: internal_api -# CephClusterNetwork: storage_mgmt -# CephPublicNetwork: storage -# # Define which network will be used for hostname resolution -# ControllerHostnameResolveNetwork: internal_api -# ComputeHostnameResolveNetwork: internal_api -# BlockStorageHostnameResolveNetwork: internal_api -# ObjectStorageHostnameResolveNetwork: internal_api -# CephStorageHostnameResolveNetwork: storage +parameters: + ServiceNetMap: + NeutronTenantNetwork: tenant + CeilometerApiNetwork: internal_api + MongoDbNetwork: internal_api + CinderApiNetwork: internal_api + CinderIscsiNetwork: storage + GlanceApiNetwork: storage + GlanceRegistryNetwork: internal_api + KeystoneAdminApiNetwork: internal_api + KeystonePublicApiNetwork: internal_api + NeutronApiNetwork: internal_api + HeatApiNetwork: internal_api + NovaApiNetwork: internal_api + NovaMetadataNetwork: internal_api + NovaVncProxyNetwork: internal_api + SwiftMgmtNetwork: storage + SwiftProxyNetwork: storage + HorizonNetwork: internal_api + MemcachedNetwork: internal_api + RabbitMqNetwork: internal_api + RedisNetwork: internal_api + MysqlNetwork: internal_api + CephClusterNetwork: storage + CephPublicNetwork: storage + # Define which network will be used for hostname resolution + ControllerHostnameResolveNetwork: internal_api + ComputeHostnameResolveNetwork: internal_api + BlockStorageHostnameResolveNetwork: internal_api + ObjectStorageHostnameResolveNetwork: internal_api + CephStorageHostnameResolveNetwork: storage |