aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
Diffstat (limited to 'environments')
-rw-r--r--environments/enable-tls.yaml3
-rw-r--r--environments/external-loadbalancer-vip.yaml7
-rw-r--r--environments/network-isolation-v6.yaml2
3 files changed, 9 insertions, 3 deletions
diff --git a/environments/enable-tls.yaml b/environments/enable-tls.yaml
index 49a87bb5..70181278 100644
--- a/environments/enable-tls.yaml
+++ b/environments/enable-tls.yaml
@@ -5,6 +5,9 @@ parameter_defaults:
SSLKey: |
The contents of the private key go here
EndpointMap:
+ AodhAdmin: {protocol: 'http', port: '8042', host: 'IP_ADDRESS'}
+ AodhInternal: {protocol: 'http', port: '8042', host: 'IP_ADDRESS'}
+ AodhPublic: {protocol: 'https', port: '13042', host: 'CLOUDNAME'}
CeilometerAdmin: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'}
CeilometerInternal: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'}
CeilometerPublic: {protocol: 'https', port: '13777', host: 'CLOUDNAME'}
diff --git a/environments/external-loadbalancer-vip.yaml b/environments/external-loadbalancer-vip.yaml
index 198892cd..8656ba1a 100644
--- a/environments/external-loadbalancer-vip.yaml
+++ b/environments/external-loadbalancer-vip.yaml
@@ -10,7 +10,8 @@ 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
- OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
+ # Management network is optional and disabled by default
+ #OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
parameter_defaults:
# When using an external loadbalancer set the following in parameter_defaults
@@ -35,6 +36,6 @@ parameter_defaults:
- 172.16.3.253
tenant:
- 172.16.0.253
- management:
- - 172.16.4.253
+ #management:
+ #- 172.16.4.253
EnableLoadBalancer: false
diff --git a/environments/network-isolation-v6.yaml b/environments/network-isolation-v6.yaml
index 599a08b1..11ca5b31 100644
--- a/environments/network-isolation-v6.yaml
+++ b/environments/network-isolation-v6.yaml
@@ -53,3 +53,5 @@ parameter_defaults:
NovaIPv6: True
# Enable IPv6 environment for RabbitMQ.
RabbitIPv6: true
+ # Enable IPv6 environment for Memcached.
+ MemcachedIPv6: true