INTPAK-173 Remove SFC ELAN config

Now that we use genius auto tunnels there is no need to include ELAN
manager config which breaks DHCP when SFC is used.

Change-Id: Iceba4201ac0e98ace88d48ae9796e4e54666966c
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/CHANGELOG b/CHANGELOG
index c792b10f91d39844338c45b0162691bc10e6c27b..9c2ad00eb1dfeeb2f930861ee1acdaf7de4c35fa 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -72,3 +72,5 @@
 - Fix Java Options to also include ODL/Karaf default options
 2018-04-25 Release 8.1.2
 - Disable MD-SAL Trust Store
+2018-05-22 Release 8.1.3
+- Remove ELAN manager config for SFC

diff --git a/files/netvirt-elanmanager-config.xml b/files/netvirt-elanmanager-config.xml
deleted file mode 100644 (file)
index 8058eb0..0000000
--- a/files/netvirt-elanmanager-config.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<elanmanager-config xmlns="urn:opendaylight:netvirt:elan:config">
-    <use-of-tunnels>true</use-of-tunnels>
-</elanmanager-config>

diff --git a/manifests/config.pp b/manifests/config.pp
index 9560ff538153481672c1567911478516210c19f5..d4a8cdad51c303df73ba86a8e0a925fdcccc2e63 100644 (file)
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -325,15 +325,6 @@ class opendaylight::config {
 
   # SFC Config
   if ('odl-netvirt-sfc' in $opendaylight::features) {
-    file { 'netvirt-elanmanager-config.xml':
-      ensure  => file,
-      path    => '/opt/opendaylight/etc/opendaylight/datastore/initial/config/netvirt-elanmanager-config.xml',
-      owner   => 'odl',
-      group   => 'odl',
-      source  => 'puppet:///modules/opendaylight/netvirt-elanmanager-config.xml',
-      require => File['/opt/opendaylight/etc/opendaylight/datastore/initial/config'],
-    }
-
     file { 'genius-itm-config.xml':
       ensure  => file,
       path    => '/opt/opendaylight/etc/opendaylight/datastore/initial/config/genius-itm-config.xml',

diff --git a/metadata.json b/metadata.json
index 60ef6729a2a874806946447d07d8b470b7c6cbfc..52d79adc6fe86c928b68c2646ed3f429e9db96a2 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
     "name": "opendaylight-opendaylight",
-    "version": "8.1.2",
+    "version": "8.1.3",
     "author": "Daniel Farrell",
     "summary": "Puppet module that installs and configures the OpenDaylight SDN controller",
     "license": "BSD-2-Clause",

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 65107d8c5d8d48655e8b32e3dc298e047b1434bb..556e4ae0013369417e155eb7baa303ec56762ec9 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -382,13 +382,6 @@ def sfc_tests()
   it { should contain_file('/opt/opendaylight/etc/opendaylight/datastore/initial/config')}
 
   it {
-    should contain_file('netvirt-elanmanager-config.xml').with(
-      'ensure'  => 'file',
-      'path'    => '/opt/opendaylight/etc/opendaylight/datastore/initial/config/netvirt-elanmanager-config.xml',
-      'owner'   => 'odl',
-      'group'   => 'odl',
-      'source'  => 'puppet:///modules/opendaylight/netvirt-elanmanager-config.xml'
-      )
     should contain_file('genius-itm-config.xml').with(
       'ensure'  => 'file',
       'path'    => '/opt/opendaylight/etc/opendaylight/datastore/initial/config/genius-itm-config.xml',

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 941d9c691710bc6336ba640ede00027bcd282c5d..93479d1c961cf415fb6668760b6a84d277948ce8 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -447,13 +447,6 @@ def sfc_validations()
   #   class, which is defined in opendaylight::params
   # TODO: Remove this possible source of bugs^^
 
-  describe file('/opt/opendaylight/etc/opendaylight/datastore/initial/config/netvirt-elanmanager-config.xml') do
-    it { should be_file }
-    it { should be_owned_by 'odl' }
-    it { should be_grouped_into 'odl' }
-    its(:content) { should match /<use-of-tunnels>true<\/use-of-tunnels>/ }
-  end
-
   describe file('/opt/opendaylight/etc/opendaylight/datastore/initial/config/genius-itm-config.xml') do
     it { should be_file }
     it { should be_owned_by 'odl' }