diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-09-16 09:20:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-09-16 09:20:43 +0000 |
| commit | f84d4e45c01cb69c4ecc8032f76f2142bfbb76e0 (patch) | |
| tree | 74fa3bbd40dab583242250791c4c4177154b78aa /puppet/manifests | |
| parent | 8a8459fb6de4b0f4a340fcec8c438c2209569ccf (diff) | |
| parent | 773324a6d05f1fb8877adf95a47e7a3d1619d099 (diff) | |
Merge "Enable Cisco Nexus and UCSM plugins"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 8 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 6cf01826..b98c3a40 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -246,6 +246,14 @@ if hiera('step') >= 3 { tunnel_types => split(hiera('neutron_tunnel_types'), ','), } + if 'cisco_ucsm' in hiera('neutron_mechanism_drivers') { + include ::neutron::plugins::ml2::cisco::ucsm + } + if 'cisco_nexus' in hiera('neutron_mechanism_drivers') { + include ::neutron::plugins::ml2::cisco::nexus + include ::neutron::plugins::ml2::cisco::type_nexus_vxlan + } + Service['neutron-server'] -> Service['neutron-dhcp-service'] Service['neutron-server'] -> Service['neutron-l3'] Service['neutron-server'] -> Service['neutron-ovs-agent-service'] diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index b1cac2ff..862c7bdb 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -608,6 +608,14 @@ if hiera('step') >= 3 { tunnel_types => split(hiera('neutron_tunnel_types'), ','), } + if 'cisco_ucsm' in hiera('neutron_mechanism_drivers') { + include ::neutron::plugins::ml2::cisco::ucsm + } + if 'cisco_nexus' in hiera('neutron_mechanism_drivers') { + include ::neutron::plugins::ml2::cisco::nexus + include ::neutron::plugins::ml2::cisco::type_nexus_vxlan + } + include ::cinder class { '::cinder::api': sync_db => $sync_db, |