diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-27 21:02:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-27 21:02:55 +0000 |
| commit | de394d0e5efecfc9e82af0ca0803d08efad06c23 (patch) | |
| tree | 7f5cd4ddd9d35377f59fdf895d57609caea1a238 /puppet | |
| parent | fb672cbb5524f71bc5e65d56ac3dfdee10d896cb (diff) | |
| parent | 7a08ed7a13220b35493aa7c1b9dd712ffb8a4c33 (diff) | |
Merge "Update the Nova Endpoint information for Cinder" into stable/ocata
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/cinder-api.yaml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml index 8c5a07ac..bde3e044 100644 --- a/puppet/services/cinder-api.yaml +++ b/puppet/services/cinder-api.yaml @@ -86,7 +86,8 @@ outputs: cinder::keystone::authtoken::project_name: 'service' cinder::api::enable_proxy_headers_parsing: true - cinder::api::nova_catalog_info: 'compute:Compute Service:internalURL' + cinder::api::nova_catalog_info: 'compute:nova:internalURL' + cinder::api::nova_catalog_admin_info: 'compute:nova:adminURL' # TODO(emilien) move it to puppet-cinder cinder::config: DEFAULT/swift_catalog_info: |