Rebase due to Fuel upstream change

An update of the Fuel upstream code requires us to perform the
corresponding change in the same file as we are modifying it in
the OPNFV context.

JIRA: #BGS-16

Change-Id: If3d5a0f1f2e97524f9e4a603cff89bc433226b92
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>

diff --git a/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp b/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp
index 48c4005..19cc0ed 100644 (file)
--- a/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp
+++ b/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp
@@ -310,6 +310,8 @@ class os_common {
     stage => 'first',
   }
 
+  class { 'osnailyfacter::ssh': }
+
   #case $role {
     #    /controller/:          { $hostgroup = 'controller' }
     #    /swift-proxy/: { $hostgroup = 'swift-proxy' }

diff --git a/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp.orig b/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp.orig
index 940beda..4b1da3a 100644 (file)
--- a/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp.orig
+++ b/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp.orig
@@ -300,6 +300,8 @@ class os_common {
     stage => 'first',
   }
 
+  class { 'osnailyfacter::ssh': }
+
   #case $role {
     #    /controller/:          { $hostgroup = 'controller' }
     #    /swift-proxy/: { $hostgroup = 'swift-proxy' }