diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-09-17 12:39:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-09-17 12:39:12 +0000 |
| commit | 6d0cec55ce50a54ede405c465f26fe87bb68af4e (patch) | |
| tree | c1b668dd32cbd0bc977e39974bdcfcd5ab630fa7 /puppet/manifests/overcloud_controller_pacemaker.pp | |
| parent | d65027bd4a676e046157ba2729866166b9d6a584 (diff) | |
| parent | e78e1c8d9b5a7ebf327987b22091bff3ed42d1c1 (diff) | |
Merge "Big Switch Neutron ML2 plugin integration"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 3a311655..e4a179d6 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -618,6 +618,16 @@ if hiera('step') >= 3 { include ::neutron::plugins::ml2::cisco::type_nexus_vxlan } + if hiera('neutron_enable_bigswitch_ml2', false) { + include neutron::plugins::ml2::bigswitch::restproxy + } + neutron_l3_agent_config { + 'DEFAULT/ovs_use_veth': value => hiera('neutron_ovs_use_veth', false); + } + neutron_dhcp_agent_config { + 'DEFAULT/ovs_use_veth': value => hiera('neutron_ovs_use_veth', false); + } + include ::cinder class { '::cinder::api': sync_db => $sync_db, |