From 89fbd07afef275e0f818d3575fd0be4a1d4248cf Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 20 Apr 2016 14:22:27 -0400 Subject: composable neutron ml2 and ovs agent Adds new puppet and puppet pacemaker specific services for the Neutron ml2 configuration and the Ovs agent. Partially-implements: blueprint composable-services-within-roles Change-Id: I896e5dfe6fae49371c9fe7f47c4364eb6f621b07 --- puppet/manifests/overcloud_controller.pp | 34 +------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) (limited to 'puppet/manifests/overcloud_controller.pp') diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index bd54e2a0..0f769150 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -247,42 +247,10 @@ if hiera('step') >= 4 { keystone_tenant => hiera('neutron::server::auth_tenant'), keystone_password => hiera('neutron::server::password') } - } else { - - include ::neutron::plugins::ml2 - include ::neutron::agents::ml2::ovs - - if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') { - include ::neutron::plugins::ml2::cisco::nexus1000v - - class { '::neutron::agents::n1kv_vem': - n1kv_source => hiera('n1kv_vem_source', undef), - n1kv_version => hiera('n1kv_vem_version', undef), - } - - class { '::n1k_vsm': - n1kv_source => hiera('n1kv_vsm_source', undef), - n1kv_version => hiera('n1kv_vsm_version', undef), - pacemaker_control => false, - } - } - - if 'cisco_ucsm' in hiera('neutron::plugins::ml2::mechanism_drivers') { - include ::neutron::plugins::ml2::cisco::ucsm - } - if 'cisco_nexus' in hiera('neutron::plugins::ml2::mechanism_drivers') { - include ::neutron::plugins::ml2::cisco::nexus - include ::neutron::plugins::ml2::cisco::type_nexus_vxlan - } - - if 'bsn_ml2' in hiera('neutron::plugins::ml2::mechanism_drivers') { - include ::neutron::plugins::ml2::bigswitch::restproxy - include ::neutron::agents::bigswitch - } - Service['neutron-server'] -> Service['neutron-ovs-agent-service'] } Service['neutron-server'] -> Service['neutron-metadata'] + } if $enable_ceph { -- cgit 1.2.3-korg