summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-09-21 15:35:55 +0000
committerTim Rozet <trozet@redhat.com>2017-09-21 15:35:55 +0000
commit18b0862b97850f3e4bfb9abf0dc5835e90f0dada (patch)
treeeea9c69e3b0b16f30c07f827646f71753910621a /build
parent433961f8c0b816f19aa858654261fa87d2f02a19 (diff)
Revert "Adds Calipso scenario"
This reverts commit 433961f8c0b816f19aa858654261fa87d2f02a19. Change-Id: Ic8a14d2e0ad8d1006625af401fde2f365890650b Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build')
-rw-r--r--build/rpm_specs/opnfv-apex-common.spec3
-rwxr-xr-xbuild/undercloud.sh4
-rw-r--r--build/variables.sh3
3 files changed, 0 insertions, 10 deletions
diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
index 3b0e1aa..c2e2f14 100644
--- a/build/rpm_specs/opnfv-apex-common.spec
+++ b/build/rpm_specs/opnfv-apex-common.spec
@@ -69,7 +69,6 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml
%{_sysconfdir}/opnfv-apex/os-nosdn-bar-noha.yaml
%{_sysconfdir}/opnfv-apex/os-nosdn-bar-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-calipso-noha.yaml
%{_sysconfdir}/opnfv-apex/os-nosdn-fdio-noha.yaml
%{_sysconfdir}/opnfv-apex/os-nosdn-fdio-ha.yaml
%{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-noha.yaml
@@ -113,8 +112,6 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
%doc %{_docdir}/opnfv/inventory.yaml.example
%changelog
-* Wed Sep 20 2017 Tim Rozet <trozet@redhat.com> - 5.0-7
-- Add calipso
* Fri Sep 08 2017 Tim Rozet <trozet@redhat.com> - 5.0-6
- Updates clean to use python
* Wed Aug 23 2017 Tim Rozet <trozet@redhat.com> - 5.0-5
diff --git a/build/undercloud.sh b/build/undercloud.sh
index d225958..05cbf55 100755
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -26,9 +26,6 @@ popd > /dev/null
# inject rt_kvm kernel rpm name into the enable file
sed "s/kvmfornfv_kernel.rpm/$kvmfornfv_kernel_rpm/" ${BUILD_ROOT}/enable_rt_kvm.yaml | tee ${BUILD_DIR}/enable_rt_kvm.yaml
-# grab latest calipso
-populate_cache $calipso_uri_base/$calipso_script
-
# Turn off GSSAPI Auth in sshd
# installing forked apex-tht
# enabling ceph OSDs to live on the controller
@@ -55,7 +52,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--upload ${BUILD_ROOT}/virtual-environment.yaml:/home/stack/ \
--upload ${BUILD_ROOT}/baremetal-environment.yaml:/home/stack/ \
--uninstall "libvirt-client" \
- --upload ${CACHE_DIR}/${calipso_script}:/root/ \
--install "libguestfs-tools" \
-a undercloud_build.qcow2
diff --git a/build/variables.sh b/build/variables.sh
index 444c5e8..a611073 100644
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -38,9 +38,6 @@ dpdk_rpms=(
kvmfornfv_uri_base="http://artifacts.opnfv.org/kvmfornfv/danube"
kvmfornfv_kernel_rpm="kvmfornfv-4bfeded9-apex-kernel-4.4.50_rt62_centos.x86_64.rpm"
-calipso_uri_base="https://git.opnfv.org/calipso/plain/app/install"
-calipso_script="calipso-installer.py"
-
netvpp_repo="https://github.com/openstack/networking-vpp"
netvpp_branch="master"
netvpp_commit=$(git ls-remote ${netvpp_repo} ${netvpp_branch} | awk '{print substr($1,1,7)}')