fix conflict with openstack ironic puppet module
force_power_state_during_sync was added to openstack puppet-ironic. https://github.com/openstack/puppet-ironic/blob/master/manifests/conductor.pp As such we need to use the class variable so that we do not have conflicts when installing the undercloud. The RDO-manager core promote job is failing on this conflict: https://ci.centos.org/view/rdo/job/rdo_manager-promote-build-delorean-rdo-kilo Change-Id: I6c0daf7da5cc74c4d415f900b26a2db65b09725e
This commit is contained in:
parent
b41885c100
commit
3aec68bebf
|
@ -321,7 +321,9 @@ class { 'nova::network::neutron':
|
||||||
neutron_region_name => '',
|
neutron_region_name => '',
|
||||||
}
|
}
|
||||||
|
|
||||||
include ::ironic::conductor
|
class { 'ironic::conductor':
|
||||||
|
force_power_state_during_sync => hiera('ironic::conductor::force_power_state_during_sync'),
|
||||||
|
}
|
||||||
|
|
||||||
class { 'ironic':
|
class { 'ironic':
|
||||||
enabled_drivers => ['pxe_ipmitool', 'pxe_ssh', 'pxe_drac'],
|
enabled_drivers => ['pxe_ipmitool', 'pxe_ssh', 'pxe_drac'],
|
||||||
|
@ -341,7 +343,6 @@ ironic_config {
|
||||||
'pxe/http_url': value => 'http://$my_ip:8088';
|
'pxe/http_url': value => 'http://$my_ip:8088';
|
||||||
'pxe/http_root': value => '/httpboot';
|
'pxe/http_root': value => '/httpboot';
|
||||||
'pxe/ipxe_enabled': value => 'True';
|
'pxe/ipxe_enabled': value => 'True';
|
||||||
'conductor/force_power_state_during_sync': value => hiera('ironic::conductor::force_power_state_during_sync');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class { 'horizon':
|
class { 'horizon':
|
||||||
|
|
Loading…
Reference in New Issue