Merge "Adds a puppet module to configure a Ceph cluster PATCHSET2: Fixes whitespace"

diff --git a/common/puppet-opnfv/manifests/init.pp b/common/puppet-opnfv/manifests/init.pp
index 6e211da..11ef18f 100644 (file)
--- a/common/puppet-opnfv/manifests/init.pp
+++ b/common/puppet-opnfv/manifests/init.pp
@@ -33,8 +33,16 @@ class opnfv {
                before => Stage['setup'],
        }
 
+      class { '::ntp':
+        stage => presetup,
+      }
+
        class { "opnfv::repo":
                stage => presetup,
        }
+      ->
+      package { "python-rados":
+        ensure => latest,
+      }
    }
 }

diff --git a/common/puppet-opnfv/manifests/repo.pp b/common/puppet-opnfv/manifests/repo.pp
index 8d8a025..eb3a2e6 100644 (file)
--- a/common/puppet-opnfv/manifests/repo.pp
+++ b/common/puppet-opnfv/manifests/repo.pp
@@ -33,22 +33,5 @@ class opnfv::repo {
       gpgcheck => 0,
     }
 
-    yumrepo {
-            "ceph":
-                   baseurl => "http://ceph.com/rpm-giant/el7/\$basearch",
-                   descr => "Ceph packages for \$basearch",
-                   enabled => 1,
-                   gpgcheck => 0;
-            "Ceph-noarch":
-                   baseurl => "http://ceph.com/rpm-giant/el7/noarch",
-                   descr => "Ceph noarch packages",
-                   enabled => 1,
-                   gpgcheck => 0;
-            "ceph-source":
-                   baseurl => "http://ceph.com/rpm-giant/el7/SRPMS",
-                   descr => "Ceph source packages",
-                   enabled => 1,
-                   gpgcheck => 0;
-    }
   }
 }

diff --git a/fuel/ci/build.sh b/fuel/ci/build.sh
index cdaa6ef..afdcab5 100755 (executable)
--- a/fuel/ci/build.sh
+++ b/fuel/ci/build.sh
@@ -99,6 +99,7 @@ INCLUDE_DIR=../include
 #
 SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 LOCK_FILE="${SCRIPT_DIR}/.build.lck"
+CACHE_TMP="${SCRIPT_DIR}/tmp"
 TEST_SUCCEED=0
 TEST_FAIL=0
 UNIT_TEST=0
@@ -283,11 +284,11 @@ echo $$ > ${LOCK_FILE}
 
 if [ ! -z ${BUILD_CACHE_URI} ]; then
     if [ ${POPULATE_CACHE} -ne 1 ]; then
-       rm -rf /tmp/cache
-       mkdir /tmp/cache
+       rm -rf ${CACHE_TMP}/cache
+       mkdir -p ${CACHE_TMP}/cache
        echo "Downloading cach file ${BUILD_CACHE_URI}/${REMOTE_CACHE_ARCH_NAME} ..."
        set +e
-       ${REMOTE_ACCESS_METHD} -o /tmp/cache/${LOCAL_CACHE_ARCH_NAME}.tgz ${BUILD_CACHE_URI}/${REMOTE_CACHE_ARCH_NAME}.tgz
+       ${REMOTE_ACCESS_METHD} -o ${CACHE_TMP}/cache/${LOCAL_CACHE_ARCH_NAME}.tgz ${BUILD_CACHE_URI}/${REMOTE_CACHE_ARCH_NAME}.tgz
        rc=$?
        set -e
        if [ $rc -ne 0 ]; then
@@ -295,8 +296,8 @@ if [ ! -z ${BUILD_CACHE_URI} ]; then
                POPULATE_CACHE=1
        else
            echo "Unpacking cache file ..."
-           tar -C /tmp/cache -xvf /tmp/cache/${LOCAL_CACHE_ARCH_NAME}.tgz
-           cp /tmp/cache/cache/.versions ${BUILD_BASE}/.
+           tar -C ${CACHE_TMP}/cache -xvf ${CACHE_TMP}/cache/${LOCAL_CACHE_ARCH_NAME}.tgz
+           cp ${CACHE_TMP}/cache/cache/.versions ${BUILD_BASE}/.
            set +e
                    make -C ${BUILD_BASE} validate-cache;
            rc=$?
@@ -306,9 +307,9 @@ if [ ! -z ${BUILD_CACHE_URI} ]; then
                echo "Cache invalid - a new cache will be built "
                POPULATE_CACHE=1
            else
-               cp -rf /tmp/cache/cache/. ${BUILD_BASE}
+               cp -rf ${CACHE_TMP}/cache/cache/. ${BUILD_BASE}
            fi
-           rm -rf /tmp/cache
+           rm -rf ${CACHE_TMP}/cache
        fi
     fi
 fi