Fix Ironic provisioning

During the Ocata cycle, some changes to puppet-nova have affected
Ironic deployments (e.g. [1]).

[1] https://review.openstack.org/391569

Change-Id: I4197cec11137bc838a64fb40ee0221bb848c5a0c
This commit is contained in:
Javier Pena 2017-03-02 10:27:09 +01:00 committed by Javier Peña
parent 523d8dcd39
commit 9544341126
4 changed files with 22 additions and 17 deletions

View File

@ -459,7 +459,7 @@ def initSequences(controller):
config['CONFIG_NEUTRON_ML2_TENANT_NETWORK_TYPES'] += ', flat'
if 'openvswitch' not in config['CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS']:
config['CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS'] += 'openvswitch'
config['CONFIG_NEUTRON_ML2_FLAT_NETWORKS'] = 'physnet1'
config['CONFIG_NEUTRON_ML2_FLAT_NETWORKS'] = 'extnet'
if use_ml2_with_sriovnicswitch(config):
if ('openvswitch' not in config['CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS']

View File

@ -1,14 +1,15 @@
class packstack::nova::compute::ironic ()
{
$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')
$ironic_config_controller_host = hiera('CONFIG_KEYSTONE_HOST_URL')
$ironic_config_keystone_admin = hiera('CONFIG_KEYSTONE_ADMIN_URL')
class { '::nova::compute::ironic':
admin_user => 'ironic',
admin_passwd => hiera('CONFIG_IRONIC_KS_PW'),
admin_url => "${ironic_config_keystone_admin}/${ironic_config_keystone_version}",
admin_tenant_name => 'services',
api_endpoint => "http://${ironic_config_controller_host}:6385/v1",
}
class { '::nova::ironic::common':
username => 'ironic',
password => hiera('CONFIG_IRONIC_KS_PW'),
auth_url => $ironic_config_keystone_admin,
project_name => 'services',
api_endpoint => "http://${ironic_config_controller_host}:6385/v1",
}
include ::nova::compute::ironic
}

View File

@ -1,7 +1,10 @@
class packstack::nova::sched::ironic ()
{
nova_config {
'DEFAULT/scheduler_host_manager':
value => 'nova.scheduler.ironic_host_manager.IronicHostManager';
}
}
class {'::nova::scheduler::filter':
scheduler_host_manager => 'ironic_host_manager',
}
class { '::nova::scheduler':
enabled => true,
}
}

3
packstack/puppet/templates/controller.pp Executable file → Normal file
View File

@ -77,8 +77,9 @@ if hiera('CONFIG_NOVA_INSTALL') == 'y' {
include '::packstack::nova::conductor'
if hiera('CONFIG_IRONIC_INSTALL') == 'y' {
include '::packstack::nova::sched::ironic'
} else {
include '::packstack::nova::sched'
}
include '::packstack::nova::sched'
include '::packstack::nova::vncproxy'
if hiera('CONFIG_NEUTRON_INSTALL') == 'y' {
include '::packstack::nova::neutron'