summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorCyril Lopez <cylopez@redhat.com>2016-12-02 17:26:52 +0100
committerCyril Lopez <cylopez@redhat.com>2017-01-09 15:19:59 +0100
commit9d64d88a497204cacb083e6ea207f2997faa9bc7 (patch)
tree02ed78c4ffadeaf7cb55e9ac87657251fa1abf4c /environments
parentae1a0e6ec0f99009ae2534c382f3123b305ce39b (diff)
Make update-from-keystone-admin-internal-api.yaml work on newton+
There are change of ServiceNetMapDefaults in service_net_map.j2.yaml but were not reproduce in update-from-keystone-admin-internal-api.yaml environment. Tested in newton. Closes-Bug: #1646862 Change-Id: I307dcaabbc6d583896090bf3f046b442007fbc42 Signed-off-by: Cyril Lopez <cylopez@redhat.com> Co-Authored-By: Gregory Charot <gcharot@redhat.com>
Diffstat (limited to 'environments')
-rw-r--r--environments/updates/update-from-keystone-admin-internal-api.yaml29
1 files changed, 1 insertions, 28 deletions
diff --git a/environments/updates/update-from-keystone-admin-internal-api.yaml b/environments/updates/update-from-keystone-admin-internal-api.yaml
index a5075300..97687c6a 100644
--- a/environments/updates/update-from-keystone-admin-internal-api.yaml
+++ b/environments/updates/update-from-keystone-admin-internal-api.yaml
@@ -2,32 +2,5 @@
# Keystone Admin API service is running on the Internal API network
parameter_defaults:
- ServiceNetMapDefaults:
- NeutronTenantNetwork: tenant
- CeilometerApiNetwork: internal_api
- MongodbNetwork: internal_api
- CinderApiNetwork: internal_api
- CinderIscsiNetwork: storage
- GlanceApiNetwork: storage
- GlanceRegistryNetwork: internal_api
+ ServiceNetMap:
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
- ControllerHostnameResolveNetwork: internal_api
- ComputeHostnameResolveNetwork: internal_api
- BlockStorageHostnameResolveNetwork: internal_api
- ObjectStorageHostnameResolveNetwork: internal_api
- CephStorageHostnameResolveNetwork: storage