diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-07-23 13:51:30 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-07-23 13:51:30 +0000 |
commit | f00e08cbfd21a39f011a291473eaf13110847725 (patch) | |
tree | 5976ad2a0962fecd4b41f6fcff5c9fb9c4231c8b /overcloud-without-mergepy.yaml | |
parent | f441b8ad6f43d6dc29fa9a327a0062684068fab2 (diff) | |
parent | 53924336a2989a1938f909b05567b93551129724 (diff) |
Merge "Wire in hieradata overrides via ExtraConfig for CephStorage"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
-rw-r--r-- | overcloud-without-mergepy.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 53d4beca..937f812f 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -597,6 +597,12 @@ parameters: type: string constraints: - custom_constraint: nova.flavor + CephStorageExtraConfig: + default: {} + description: | + CephStorage specific configuration to inject into the cluster. Same + structure as ExtraConfig. + type: json # Hostname format for each role # Note %index% is translated into the index of the node, e.g 0/1/2 etc @@ -940,6 +946,8 @@ resources: template: {get_param: CephStorageHostnameFormat} params: '%stackname%': {get_param: 'OS::stack_name'} + ExtraConfig: {get_param: ExtraConfig} + CephStorageExtraConfig: {get_param: CephStorageExtraConfig} ControllerIpListMap: type: OS::TripleO::Network::Ports::NetIpListMap |