Fix the c7 conversion function

Change-Id: I6b6a185518cdb28ff8a3bc443c6143d185128c56

lib/puppet/parser/functions/c7_int_name.rb

@@ -13,7 +13,7 @@ module Puppet::Parser::Functions
 
     if Facter.value('osfamily') == 'Debian'
       os_majrelease = Facter.value('operatingsystemmajrelease')
-      if(os_majrelease != '16.04')
+      if(os_majrelease == '16.04')
         interfaces = {}
         kernel_devs=`/sbin/biosdevname -d`
         if ($?.to_i == 4)

manifests/resources/network_creation.pp

@@ -116,6 +116,13 @@ define midonet::resources::network_creation(
       before => Neutron_router[$edge_router_name]
     }
   }
+  if($::osfamily == 'RedHat')
+  {
+    package {'biosdevname':
+      ensure => 'latest',
+      before => Neutron_router[$edge_router_name]
+    }
+  }
 
   neutron_network { $network_external:
     router_external => true,

spec/acceptance/midonet_agent_spec.rb

@@ -17,7 +17,6 @@ describe 'midonet::agent class' do
         require         => Class['midonet_openstack::role::nsdb'],
         max_heap_size   => "256M"
       }
-      include ::midonet::agent::scrapper
       EOS
 
       # Run it twice and test for idempotency

spec/acceptance/midonet_cluster_spec.rb

@@ -6,6 +6,8 @@ describe 'midonet::cluster class' do
     it 'should install the midonet cluster without any errors' do
       pp = <<-EOS
       include ::midonet::repository
+      class { 'midonet_openstack::role::nsdb':
+      }
       class { 'midonet::cluster':
         zookeeper_hosts       => [{ 'ip' => '127.0.0.1', 'port' => '2181' }],
         cassandra_servers     => ['127.0.0.1'],