diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-08-09 17:56:14 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2016-08-12 21:27:57 +0100 |
| commit | ac8d5919d86027aa9e0f523f77e3071b36b8a7d0 (patch) | |
| tree | 1a90b779e24cb2d29aab761311f71ee1e8b0a1b7 /overcloud-resource-registry-puppet.yaml | |
| parent | 8c61510e601473cabd60264eff7fc5b6f9f2ebb8 (diff) | |
Convert ServiceNetMap to a nested template
We introduce a new ServiceNetMap resource which enables some more flexible
mappings between the services and their networks.
Specifically this patch means:
1. ServiceNetMap no longer has to specify the entire list of all services,
operators may if they wish, but a subset is now valid where you want to
accept the defaults for some services (the defaults are now accessible via
the ServiceNetMapDefaults parameter.
2. We can map some keys which don't fit a pattern that enables conversion
from CamelCase to snake_case which is required for compatibility with the
service_names in puppet/services*
This should be backwards compatible, and in future when we remove internal
dependency on the CamelCase names, we could also enable operators to
specify e.g heat_api_network in ServiceNetMap which would be more consistent.
Change-Id: Ib60198adf76bb69ffbafbfac739e356d153f6194
Partially-Implements: blueprint custom-roles
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 59c0d7da..0ff634d4 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -118,6 +118,9 @@ resource_registry: OS::TripleO::BlockStorage::Ports::TenantPort: network/ports/noop.yaml OS::TripleO::BlockStorage::Ports::ManagementPort: network/ports/noop.yaml + # Service to network Mappings + OS::TripleO::ServiceNetMap: network/service_net_map.yaml + # Service Endpoint Mappings OS::TripleO::EndpointMap: network/endpoints/endpoint_map.yaml |