Merge "Use correct endpoint name"

packstack/puppet/templates/cinder.pp

@@ -15,6 +15,8 @@ class { '::cinder::api':
   keystone_user           => 'cinder',
   auth_uri                => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
   identity_uri            => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
+  nova_catalog_info       => 'compute:nova:publicURL',
+  nova_catalog_admin_info => 'compute:nova:adminURL'
 }
 
 # TO-DO: Remove this workaround as soon as module support is implemented (see rhbz#1300662)