diff options
Diffstat (limited to 'build')
| -rwxr-xr-x | build/barometer-install.sh | 5 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/build/barometer-install.sh b/build/barometer-install.sh index 15753a44..ca9b79c1 100755 --- a/build/barometer-install.sh +++ b/build/barometer-install.sh @@ -29,7 +29,7 @@ GETFLAG="--no-check-certificate" # Locations of repos ARTIFACTS_BAROM="artifacts.opnfv.org/barometer" COLLECTD_OPENSTACK_REPO="https://github.com/openstack/collectd-ceilometer-plugin" -PUPPET_BAROMETER_REPO="https://github.com/johnhinman/puppet-barometer" +PUPPET_BAROMETER_REPO="https://github.com/opnfv/barometer.git" # upload barometer packages tar, extract, and install @@ -87,7 +87,8 @@ function barometer_pkgs { # get the barometer puppet module and tar it rm -rf puppet-barometer - git clone $PUPPET_BAROMETER_REPO + git clone $PUPPET_BAROMETER_REPO puppet-barometer + cd puppet-barometer pushd puppet-barometer/ > /dev/null git archive --format=tar.gz HEAD > ${BUILD_DIR}/puppet-barometer.tar.gz popd > /dev/null diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 098ab023..1b7843a0 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -109,8 +109,8 @@ cat > ${BUILD_DIR}/kubernetes.repo << EOF name=Kubernetes baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64 enabled=1 -gpgcheck=1 -repo_gpgcheck=1 +gpgcheck=0 +repo_gpgcheck=0 gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg EOF |