From f7af7a686b888828808786a219dbed45c932d130 Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Thu, 21 Sep 2017 22:26:34 -0400
Subject: Remove calling fdio class from honeycomb

We currently invoke fdio class from honeycomb, this could cause problem
if fdio is invoked somewhere else in the manifest with resource style
invokation. It should be safe to assume fdio will be called when honeycomb
class is used.

Also removes custom honeycomb restart command.

JIRA: PUP-7

Change-Id: I19348c4e59778fa65dc0ceea895185e68f8afcaf
Signed-off-by: Feng Pan <fpan@redhat.com>
---
 manifests/honeycomb.pp            | 3 ---
 spec/acceptance/honeycomb_spec.rb | 1 +
 spec/classes/honeycomb_spec.rb    | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/honeycomb.pp b/manifests/honeycomb.pp
index ef216c3..619f98e 100644
--- a/manifests/honeycomb.pp
+++ b/manifests/honeycomb.pp
@@ -63,8 +63,6 @@ class fdio::honeycomb (
 
   validate_array($interface_role_map)
 
-  include ::fdio
-
   package { 'honeycomb':
     ensure  => present,
     require => Package['vpp'],
@@ -85,7 +83,6 @@ class fdio::honeycomb (
     hasstatus  => true,
     hasrestart => true,
     require    => [ Service['vpp'], Package['honeycomb'] ],
-    restart    => 'systemctl stop vpp;systemctl stop honeycomb;rm -rf /var/lib/honeycomb/persist/*;systemctl start vpp; sleep 5;systemctl start honeycomb',
   }
 
   if !empty($opendaylight_ip) {
diff --git a/spec/acceptance/honeycomb_spec.rb b/spec/acceptance/honeycomb_spec.rb
index 012693b..36f8a2e 100644
--- a/spec/acceptance/honeycomb_spec.rb
+++ b/spec/acceptance/honeycomb_spec.rb
@@ -5,6 +5,7 @@ describe 'fdio::honeycomb' do
   describe 'default parameters' do
     it 'should work with no errors' do
       pp= <<-EOS
+      class { '::fdio': }
       class { '::fdio::honeycomb': }
       EOS
 
diff --git a/spec/classes/honeycomb_spec.rb b/spec/classes/honeycomb_spec.rb
index fcd31f6..8fc2252 100644
--- a/spec/classes/honeycomb_spec.rb
+++ b/spec/classes/honeycomb_spec.rb
@@ -7,6 +7,8 @@ describe 'fdio::honeycomb' do
       :operatingsystemmajrelease => '7',
   }}
 
+  let(:pre_condition) { 'include fdio' }
+
   it { should compile }
   it { should compile.with_all_deps }
   it { should contain_class('fdio::honeycomb') }
-- 
cgit 1.2.3-korg