diff options
author | 2016-07-12 17:37:44 +0000 | |
---|---|---|
committer | 2016-07-12 17:37:44 +0000 | |
commit | 01e510b754a9bf37193af73e7f38770dd661683c (patch) | |
tree | 4fcd9d2e1aa5898fddadefd62edc0ee0a24121a5 /puppet/manifests/overcloud_compute.pp | |
parent | a31fc6c250683d5463dc9cba4db4f5e09f45dbb4 (diff) | |
parent | 2a6ae1bab53a9dc051d9b307da3ee8d8e8c2ebc3 (diff) |
Merge "Composable Neutron Core Compute Plugin"
Diffstat (limited to 'puppet/manifests/overcloud_compute.pp')
-rw-r--r-- | puppet/manifests/overcloud_compute.pp | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index b25d62f8..9bebec67 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -40,9 +40,6 @@ if hiera('step') >= 4 { } } - include ::neutron - include ::neutron::config - # If the value of core plugin is set to 'nuage', # include nuage agent, # If the value of core plugin is set to 'midonet', @@ -93,32 +90,6 @@ if hiera('step') >= 4 { content => "nova ALL=(root) NOPASSWD: /opt/pg/bin/ifc_ctl_pp *\n", } } - else { - - # NOTE: this code won't live in puppet-neutron until Neutron OVS agent - # can be gracefully restarted. See https://review.openstack.org/#/c/297211 - # In the meantime, it's safe to restart the agent on each change in neutron.conf, - # because Puppet changes are supposed to be done during bootstrap and upgrades. - # Some resource managed by Neutron_config (like messaging and logging options) require - # a restart of OVS agent. This code does it. - # In Newton, OVS agent will be able to be restarted gracefully so we'll drop the code - # from here and fix it in puppet-neutron. - Neutron_config<||> ~> Service['neutron-ovs-agent-service'] - - include ::neutron::plugins::ml2 - include ::neutron::agents::ml2::ovs - - if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') { - class { '::neutron::agents::n1kv_vem': - n1kv_source => hiera('n1kv_vem_source', undef), - n1kv_version => hiera('n1kv_vem_version', undef), - } - } - - if 'bsn_ml2' in hiera('neutron::plugins::ml2::mechanism_drivers') { - include ::neutron::agents::bigswitch - } - } include ::ceilometer include ::ceilometer::config |