openstack/puppet-openstack-integration
Code Issues Proposed changes

Debian: correctly set placement endpoint

Browse Source 
When using Debian's uwsgi setup, we don't use /placement in the URL. This
patch fixes it.

Change-Id: I88aa6894eeb175fe20c6f9f0812cb8a6d747a558
This commit is contained in:
Thomas Goirand 2018-05-08 16:20:09 +02:00
parent ef21f159f2
commit 59042b6234
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/nova.pp
View File

@ -89,12 +89,21 @@ class openstack_integration::nova (
admin_url => "${::openstack_integration::config::base_url}:8774/v2.1", admin_url => "${::openstack_integration::config::base_url}:8774/v2.1",
password => 'a_big_secret', password => 'a_big_secret',
} }
if ($::os_package_type == 'debian') {
class { '::nova::keystone::auth_placement':
public_url => "${::openstack_integration::config::base_url}:8778",
internal_url => "${::openstack_integration::config::base_url}:8778",
admin_url => "${::openstack_integration::config::base_url}:8778",
password => 'a_big_secret',
}
} else {
class { '::nova::keystone::auth_placement': class { '::nova::keystone::auth_placement':
public_url => "${::openstack_integration::config::base_url}:8778/placement", public_url => "${::openstack_integration::config::base_url}:8778/placement",
internal_url => "${::openstack_integration::config::base_url}:8778/placement", internal_url => "${::openstack_integration::config::base_url}:8778/placement",
admin_url => "${::openstack_integration::config::base_url}:8778/placement", admin_url => "${::openstack_integration::config::base_url}:8778/placement",
password => 'a_big_secret', password => 'a_big_secret',
} }
}
class { '::nova::keystone::authtoken': class { '::nova::keystone::authtoken':
password => 'a_big_secret', password => 'a_big_secret',
user_domain_name => 'Default', user_domain_name => 'Default',