From 136bfee6d8a4dddd18d621047086031a1bb584d2 Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Mon, 26 Sep 2016 14:39:23 -0400
Subject: VPP version update

- Update VPP version to latest on 16.09 branch
- Change networking-vpp repo to point to openstack.
- Update VPP python API rpm location
- Configure etcd for networking-vpp ML2 plugin

opnfv-tht-pr: 85

JIRA: APEX-283

Change-Id: I4e69de3c51b1f4221995cc8568cdfa18aacbc55c
Signed-off-by: Feng Pan <fpan@redhat.com>
---
 .../provider/neutron_agent_vpp/ini_setting.rb      | 15 ++++++++++++
 .../lib/puppet/type/neutron_agent_vpp.rb           | 28 ++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 build/puppet-neutron/lib/puppet/provider/neutron_agent_vpp/ini_setting.rb
 create mode 100644 build/puppet-neutron/lib/puppet/type/neutron_agent_vpp.rb

(limited to 'build/puppet-neutron/lib/puppet')

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
new file mode 100644
index 00000000..595904ce
--- /dev/null
+++ b/build/puppet-neutron/lib/puppet/provider/neutron_agent_vpp/ini_setting.rb
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 00000000..f43a8b41
--- /dev/null
+++ b/build/puppet-neutron/lib/puppet/type/neutron_agent_vpp.rb
@@ -0,0 +1,28 @@
+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
-- 
cgit 1.2.3-korg