diff options
author | Dan Prince <dprince@redhat.com> | 2016-07-06 14:21:38 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2016-07-12 09:48:31 -0400 |
commit | 613e009d9f52e5a95a95e7e7ed2491ccc06e89d6 (patch) | |
tree | 48cd25a2699548a8d9b89a36eaac47f566038c70 /puppet | |
parent | bf76cf6c706682047747956304f1e7643a816212 (diff) |
Composable Plumgrid compute plugin
Adds a new neutron compute plugin used to help configure plumgrid
for use on compute nodes.
Change-Id: Ied6493aba826a602b2ce73359d1acf26ebe89869
Diffstat (limited to 'puppet')
-rw-r--r-- | puppet/manifests/overcloud_compute.pp | 14 | ||||
-rw-r--r-- | puppet/services/neutron-compute-plugin-plumgrid.yaml | 19 |
2 files changed, 19 insertions, 14 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 6c74ee85..5d315a72 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -42,20 +42,6 @@ if hiera('step') >= 4 { # require => Class['contrail::vrouter'], #} } - elsif hiera('neutron::core_plugin') == 'networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2' { - # forward all ipv4 traffic - # this is required for the vms to pass through the gateways public interface - sysctl::value { 'net.ipv4.ip_forward': value => '1' } - - # ifc_ctl_pp needs to be invoked by root as part of the vif.py when a VM is powered on - file { '/etc/sudoers.d/ifc_ctl_sudoers': - ensure => file, - owner => root, - group => root, - mode => '0440', - content => "nova ALL=(root) NOPASSWD: /opt/pg/bin/ifc_ctl_pp *\n", - } - } include ::ceilometer include ::ceilometer::config diff --git a/puppet/services/neutron-compute-plugin-plumgrid.yaml b/puppet/services/neutron-compute-plugin-plumgrid.yaml new file mode 100644 index 00000000..b8ec389e --- /dev/null +++ b/puppet/services/neutron-compute-plugin-plumgrid.yaml @@ -0,0 +1,19 @@ +heat_template_version: 2016-04-08 + +description: > + OpenStack Neutron Compute Plumgrid plugin + +parameters: + EndpointMap: + default: {} + description: Mapping of service endpoint -> protocol. Typically set + via parameter_defaults in the resource registry. + type: json + +outputs: + role_data: + description: Role data for the Neutron Compute Plumgrid plugin + value: + config_settings: + step_config: | + include tripleo::profile::base::neutron::plumgrid |