diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-21 15:14:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-21 15:14:49 +0000 |
| commit | 374b101683eb695b4aad44cb086c1a1748042d12 (patch) | |
| tree | 30f14e861d64518eac3f5e4c1450b9352f08bdb1 /puppet/services | |
| parent | 791c552817c339d5d08404d07dec8f55bc71f373 (diff) | |
| parent | f6a83fe95d288deec357debfa38cab7bee74467c (diff) | |
Merge "Fix bogus parameters in get_param" into stable/ocata
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/cinder-backend-scaleio.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/opendaylight-api.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/puppet/services/cinder-backend-scaleio.yaml b/puppet/services/cinder-backend-scaleio.yaml index eb709cd5..c4e4aa3d 100644 --- a/puppet/services/cinder-backend-scaleio.yaml +++ b/puppet/services/cinder-backend-scaleio.yaml @@ -106,6 +106,6 @@ outputs: cinder::backend::scaleio::sio_round_volume_capacity: {get_param: CinderScaleIORoundVolumeCapacity} cinder::backend::scaleio::sio_unmap_volume_before_deletion: {get_param: CinderScaleIOUnmapVolumeBeforeDeletion} cinder::backend::scaleio::sio_max_over_subscription_ratio: {get_param: CinderScaleIOMaxOverSubscriptionRatio} - cinder::backend::scaleio::sio_thin_provision: {get_param: CinderScaleIOThinProvision} + cinder::backend::scaleio::sio_thin_provision: {get_param: CinderScaleIOSanThinProvision} step_config: | include ::tripleo::profile::base::cinder::volume diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml index ceb56a81..e55cd2ee 100644 --- a/puppet/services/opendaylight-api.yaml +++ b/puppet/services/opendaylight-api.yaml @@ -59,7 +59,7 @@ outputs: opendaylight::extra_features: {get_param: OpenDaylightFeatures} opendaylight::enable_dhcp: {get_param: OpenDaylightEnableDHCP} opendaylight::odl_bind_ip: {get_param: [ServiceNetMap, OpendaylightApiNetwork]} - opendaylight::nb_connection_protocol: {get_param: OpenDayLightConnectionProtocol} + opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol} tripleo.opendaylight_api.firewall_rules: '137 opendaylight api': dport: |