diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-06-10 15:42:22 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-06-16 15:04:25 -0400 |
| commit | 37bb689a0fe37e9365373dbd47291a4323d36bd7 (patch) | |
| tree | 0480cda17386bda863460022a11b6221bdb2a736 /puppet/manifests | |
| parent | 29e04f6dde2ba04edb1861262694fe60fc794362 (diff) | |
Composable opencontrail plugin
Partially-implements: blueprint composable-services-within-roles
Change-Id: I17ac5dc2a6fb82a82d1db039e61fc8e87ba88333
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 25 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 3 |
2 files changed, 7 insertions, 21 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index e22bf449..94528809 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -202,26 +202,15 @@ if hiera('step') >= 4 { } - # If the value of core plugin is set to 'opencontrail' - # include opencontrail core plugins - # else use the default value of 'ml2' - if hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' { - include ::neutron::plugins::opencontrail - } else { - - # If the value of core plugin is set to 'midonet', - # skip all the ML2 configuration - if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' { + # If the value of core plugin is set to 'midonet', + # skip all the ML2 configuration + if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' { - class {'::neutron::plugins::midonet': - midonet_api_ip => hiera('public_virtual_ip'), - keystone_tenant => hiera('neutron::server::auth_tenant'), - keystone_password => hiera('neutron::server::password') - } + class {'::neutron::plugins::midonet': + midonet_api_ip => hiera('public_virtual_ip'), + keystone_tenant => hiera('neutron::server::auth_tenant'), + keystone_password => hiera('neutron::server::password') } - - Service['neutron-server'] -> Service['neutron-metadata'] - } if $enable_ceph { diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 27834cf8..13331c9e 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -400,9 +400,6 @@ MYSQL_HOST=localhost\n", } - if hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' { - include ::neutron::plugins::opencontrail - } if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' { class {'::neutron::plugins::midonet': midonet_api_ip => hiera('public_virtual_ip'), |