Merge "Workaround of use_neutron option"

This commit is contained in:
Jenkins 2017-03-10 08:26:54 +00:00 committed by Gerrit Code Review
commit a7cdbcce6a
3 changed files with 12 additions and 0 deletions

View File

@ -144,6 +144,10 @@ class openstack_tasks::ironic::ironic_compute {
neutron_admin_auth_url => "${admin_identity_uri}/v3",
}
# Remove this once nova package is updated and contains
# use_neutron set to true by default LP #1668623
ensure_resource('nova_config', 'DEFAULT/use_neutron', {'value' => true })
pcmk_resource { 'p_nova_compute_ironic':
ensure => 'present',
primitive_class => 'ocf',

View File

@ -84,6 +84,10 @@ class openstack_tasks::openstack_network::compute_nova {
neutron_ovs_bridge => $neutron_integration_bridge,
}
# Remove this once nova package is updated and contains
# use_neutron set to true by default LP #1668623
ensure_resource('nova_config', 'DEFAULT/use_neutron', {'value' => true })
augeas { 'sysctl-net.bridge.bridge-nf-call-arptables':
context => '/files/etc/sysctl.conf',
changes => "set net.bridge.bridge-nf-call-arptables '1'",

View File

@ -36,6 +36,10 @@ class openstack_tasks::openstack_network::server_nova {
neutron_ovs_bridge => $neutron_ovs_bridge,
}
# Remove this once nova package is updated and contains
# use_neutron set to true by default LP #1668623
ensure_resource('nova_config', 'DEFAULT/use_neutron', {'value' => true })
if $conf_nova {
include ::nova::params
service { 'nova-api':