Change fdio repo configuration.

- Install repo config only when explicitly passed. This implies that
when puppet-fdio is used stand alone, it is expected that user will
supply a valid repo_branch parameter.

Change-Id: Ic2485a66d4ce4fb921304a39fe65f79abed781f0
Signed-off-by: Wojciech Dec <wdec@cisco.com>
Signed-off-by: Feng Pan <fpan@redhat.com>

1 files changed, 17 insertions, 13 deletions

diff --git a/manifests/install.pp b/manifests/install.pp
index bad8ec4..7a30594 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -3,26 +3,30 @@
 # Manages the installation of fdio.
 #
 class fdio::install {
-  $base_url = $fdio::repo_branch ? {
-    'release' => 'https://nexus.fd.io/content/repositories/fd.io.centos7/',
-    'master'  => 'https://nexus.fd.io/content/repositories/fd.io.master.centos7/',
-    default   => "https://nexus.fd.io/content/repositories/fd.io.${fdio::repo_branch}.centos7/",
-  }
 
-  # Add fdio's Yum repository
-  yumrepo { "fdio-${fdio::repo_branch}":
-    baseurl  => $base_url,
-    descr    => "FD.io ${fdio::repo_branch} packages",
-    enabled  => 1,
-    gpgcheck => 0,
+  if !empty($fdio::repo_branch) and $fdio::repo_branch != 'none' {
+    $base_url = $fdio::repo_branch ? {
+      'release' => 'https://nexus.fd.io/content/repositories/fd.io.centos7/',
+      'master'  => 'https://nexus.fd.io/content/repositories/fd.io.master.centos7/',
+      default   => "https://nexus.fd.io/content/repositories/fd.io.${fdio::repo_branch}.centos7/",
+    }
+
+    # Add fdio's Yum repository
+    yumrepo { "fdio-${fdio::repo_branch}":
+      baseurl  => $base_url,
+      descr    => "FD.io ${fdio::repo_branch} packages",
+      enabled  => 1,
+      gpgcheck => 0,
+      notify   => Package['vpp'],
+    }
   }
 
   # Install the VPP RPM
   package { 'vpp':
-    ensure  => present,
-    require => Yumrepo["fdio-${fdio::repo_branch}"],
+    ensure => present,
   }
 
+
   if $fdio::vpp_dpdk_support {
     package { 'vpp-plugins':
       ensure  => present,