x/packstack
Code Issues Proposed changes

Merge "Add version number to admin_url parameter in nova.conf ironic section"

Browse Source
This commit is contained in:
Jenkins
2016-01-26 16:57:35 +00:00
committed by Gerrit Code Review
parent a605e772c1 6cd7036bdf
commit dfe39696e2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packstack/puppet/templates/nova_compute_ironic.pp
View File

@@ -1,9 +1,11 @@
$ironic_config_controller_host = hiera('CONFIG_KEYSTONE_HOST_URL') $ironic_config_controller_host = hiera('CONFIG_KEYSTONE_HOST_URL')
$ironic_config_keystone_admin = hiera('CONFIG_KEYSTONE_ADMIN_URL')
$ironic_config_keystone_version = hiera('CONFIG_KEYSTONE_API_VERSION')
class { '::nova::compute::ironic': class { '::nova::compute::ironic':
admin_user => 'ironic', admin_user => 'ironic',
admin_passwd => hiera('CONFIG_IRONIC_KS_PW'), admin_passwd => hiera('CONFIG_IRONIC_KS_PW'),
admin_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'), admin_url => "${ironic_config_keystone_admin}/${ironic_config_keystone_version}",
admin_tenant_name => 'services', admin_tenant_name => 'services',
api_endpoint => "http://${ironic_config_controller_host}:6385/v1", api_endpoint => "http://${ironic_config_controller_host}:6385/v1",
} }