diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-09-05 22:57:43 +0100 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2016-09-13 19:54:29 +0000 |
| commit | e8510077ea45bade550615e348a7fa6392639da9 (patch) | |
| tree | 5f621f202a26f8770dfa2a6d677f9063a86b4335 /puppet | |
| parent | fea45b47adb4217722791a0551055dd4a3a6f02c (diff) | |
Move role ResourceGroups inside the jinja2 loop
This moves the now nearly identical group resources inside the loop
there's a FIXME related to some deprecated compute parameters we'll
need to work around.
Change-Id: Iddd63c42754867125e65e7721ab9d9f46f4d6afb
Partially-Implements: blueprint custom-roles
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/ceph-storage.yaml | 5 | ||||
| -rw-r--r-- | puppet/cinder-storage.yaml | 5 | ||||
| -rw-r--r-- | puppet/swift-storage.yaml | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml index 17825aaa..62748f94 100644 --- a/puppet/ceph-storage.yaml +++ b/puppet/ceph-storage.yaml @@ -27,6 +27,11 @@ parameters: description: Mapping of service_name -> network name. Typically set via parameter_defaults in the resource registry. type: json + EndpointMap: + default: {} + description: Mapping of service endpoint -> protocol. Typically set + via parameter_defaults in the resource registry. + type: json UpdateIdentifier: default: '' type: string diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml index 41d5ef8e..f5118c2c 100644 --- a/puppet/cinder-storage.yaml +++ b/puppet/cinder-storage.yaml @@ -48,6 +48,11 @@ parameters: description: Mapping of service_name -> network name. Typically set via parameter_defaults in the resource registry. type: json + EndpointMap: + default: {} + description: Mapping of service endpoint -> protocol. Typically set + via parameter_defaults in the resource registry. + type: json NetworkDeploymentActions: type: comma_delimited_list description: > diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml index ff0012ff..9eb66314 100644 --- a/puppet/swift-storage.yaml +++ b/puppet/swift-storage.yaml @@ -27,6 +27,11 @@ parameters: description: Mapping of service_name -> network name. Typically set via parameter_defaults in the resource registry. type: json + EndpointMap: + default: {} + description: Mapping of service endpoint -> protocol. Typically set + via parameter_defaults in the resource registry. + type: json Hostname: type: string default: '' # Defaults to Heat created hostname |