Add support for odl-fdio scenario

Changes:
- Kernel parameters are now set through first-boot.yaml during deployment. No custom
  images will be built. Note that all nodes will be configured the same way, we only
  use compute's kernel parameter settings currently (from deploy settings file)
- Add support for VPP interface type in network settings file, it is now possible
  to specify vpp_interface type and uio_driver for tenant nic in network settings
  file. A new example config, network_settings_vpp.yaml is added.
- Add support for odl_l2-fdio scenario.

Limitations:
- Physical NIC names must be specified in network settings file, numbered nic names
  such as nic1 are not supported for fdio scenarios.
- The same kernel parameters will be configured for all nodes. The paramters will be
  taken from compute kernel parameter section in deploy settings file.

opnfv-tht-pr: 104
opnfv-puppet-tripleo-pr: 12
os-net-config-pr: 3

Change-Id: Ie9d6151e6e58d11da3c66fbcabe4a0886c3fa152
Signed-off-by: Feng Pan <fpan@redhat.com>

4 files changed, 0 insertions, 159 deletions

diff --git a/build/puppet-neutron/lib/puppet/provider/neutron_agent_vpp/ini_setting.rb b/build/puppet-neutron/lib/puppet/provider/neutron_agent_vpp/ini_setting.rb
deleted file mode 100644
index 595904ce..00000000
--- a/build/puppet-neutron/lib/puppet/provider/neutron_agent_vpp/ini_setting.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-Puppet::Type.type(:neutron_agent_vpp).provide(
-  :ini_setting,
-  :parent => Puppet::Type.type(:openstack_config).provider(:ini_setting)
-) do
-
-  def self.file_path
-    '/etc/neutron/plugins/ml2/vpp_agent.ini'
-  end
-
-  # added for backwards compatibility with older versions of inifile
-  def file_path
-    self.class.file_path
-  end
-
-end
\ No newline at end of file
diff --git a/build/puppet-neutron/lib/puppet/type/neutron_agent_vpp.rb b/build/puppet-neutron/lib/puppet/type/neutron_agent_vpp.rb
deleted file mode 100644
index f43a8b41..00000000
--- a/build/puppet-neutron/lib/puppet/type/neutron_agent_vpp.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-Puppet::Type.newtype(:neutron_agent_vpp) do
-
-  ensurable
-
-  newparam(:name, :namevar => true) do
-    desc 'Section/setting name to manage from vpp agent config.'
-    newvalues(/\S+\/\S+/)
-  end
-
-  newproperty(:value) do
-    desc 'The value of the setting to be defined.'
-    munge do |value|
-      value = value.to_s.strip
-      value.capitalize! if value =~ /^(true|false)$/i
-      value
-    end
-  end
-
-  newparam(:ensure_absent_val) do
-    desc 'A value that is specified as the value property will behave as if ensure => absent was specified'
-    defaultto('<SERVICE DEFAULT>')
-  end
-
-  autorequire(:package) do
-    'networking-vpp'
-  end
-
-end
\ No newline at end of file
diff --git a/build/puppet-neutron/manifests/agents/ml2/networking-vpp.pp b/build/puppet-neutron/manifests/agents/ml2/networking-vpp.pp
deleted file mode 100644
index 6184e006..00000000
--- a/build/puppet-neutron/manifests/agents/ml2/networking-vpp.pp
+++ /dev/null
@@ -1,65 +0,0 @@
-# == Class: neutron::agents::ml2::networking-vpp
-#
-# Setups networking-vpp Neutron agent for ML2 plugin.
-#
-# === Parameters
-#
-# [*package_ensure*]
-#   (optional) Package ensure state.
-#   Defaults to 'present'.
-#
-# [*enabled*]
-#   (required) Whether or not to enable the agent.
-#   Defaults to true.
-#
-# [*manage_service*]
-#   (optional) Whether to start/stop the service
-#   Defaults to true
-#
-# [*physnets*]
-#   List of <physical_network>:<physical_interface>
-#   tuples mapping physical network names to agent's node-specific physical
-#   network interfaces. Defaults to empty list.
-#
-# [*etcd_host*]
-#   etcd server host name/ip
-#   Defaults to 127.0.0.1.
-#
-# [*etcd_port*]
-#   etcd server listening port.
-#   Defaults to 4001.
-#
-class neutron::agents::ml2::networking-vpp (
-  $package_ensure   = 'present',
-  $enabled          = true,
-  $manage_service   = true,
-  $physnets         = '',
-  $etcd_host        = '127.0.0.1',
-  $etcd_port        = 4001,
-) {
-
-  include ::neutron::params
-
-  Neutron_agent_vpp<||> ~> Service['networking-vpp-agent']
-
-  neutron_agent_vpp {
-    'ml2_vpp/physnets': value => $physnets;
-    'ml2_vpp/etcd_host': value => $etcd_host;
-    'ml2_vpp/etcd_port': value => $etcd_port;
-    'DEFAULT/host': value => $::fqdn;
-  }
-
-  if $manage_service {
-    if $enabled {
-      $service_ensure = 'running'
-    } else {
-      $service_ensure = 'stopped'
-    }
-  }
-
-  service { 'networking-vpp-agent':
-    ensure => $service_ensure,
-    name   => 'networking-vpp-agent',
-    enable => $enabled,
-  }
-}
\ No newline at end of file
diff --git a/build/puppet-neutron/manifests/plugins/ml2/networking-vpp.pp b/build/puppet-neutron/manifests/plugins/ml2/networking-vpp.pp
deleted file mode 100644
index cf8fe178..00000000
--- a/build/puppet-neutron/manifests/plugins/ml2/networking-vpp.pp
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Install the networking-vpp ML2 mechanism driver and generate config file
-# from parameters in the other classes.
-#
-# === Parameters
-#
-# [*package_ensure*]
-# (optional) The intended state of the networking-vpp
-# package, i.e. any of the possible values of the 'ensure'
-# property for a package resource type.
-# Defaults to 'present'
-#
-# [*etcd_host*]
-# (required) etcd server host name or IP.
-# Defaults to '127.0.0.1'
-#
-# [*etcd_port*]
-# (optional) etcd server listening port.
-# Defaults to 4001.
-#
-# [*etcd_user*]
-# (optional) User name for etcd authentication
-# Defaults to ''.
-#
-# [*etcd_pass*]
-# (optional) Password for etcd authentication
-# Defaults to ''.
-#
-class neutron::plugins::ml2::networking-vpp (
-  $package_ensure  = 'present',
-  $etcd_host       = '127.0.0.1',
-  $etcd_port       = 4001,
-  $etcd_user       = '',
-  $etcd_pass       = '',
-) {
-  require ::neutron::plugins::ml2
-
-  ensure_resource('package', 'networking-vpp',
-    {
-      ensure => $package_ensure,
-      tag    => 'openstack',
-    }
-  )
-
-  neutron_plugin_ml2 {
-    'ml2_vpp/etcd_host': value => $etcd_host;
-    'ml2_vpp/etcd_port': value => $etcd_port;
-    'ml2_vpp/etcd_user': value => $etcd_user;
-    'ml2_vpp/etcd_pass': value => $etcd_pass;
-  }
-}