diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-09-21 19:05:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-21 19:05:03 +0000 |
| commit | fbc49a7d84eefbecb2ef9774bae99d30e66a52be (patch) | |
| tree | d57f6937f754af2cd033b379765199a6d78ee904 /build | |
| parent | 330a071566034447fa6a4de17e56be1cceb1c83b (diff) | |
| parent | 18b0862b97850f3e4bfb9abf0dc5835e90f0dada (diff) | |
Merge "Revert "Adds Calipso scenario""
Diffstat (limited to 'build')
| -rw-r--r-- | build/rpm_specs/opnfv-apex-common.spec | 3 | ||||
| -rwxr-xr-x | build/undercloud.sh | 4 | ||||
| -rw-r--r-- | build/variables.sh | 3 |
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 3b0e1aa5..c2e2f14e 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 d225958f..05cbf552 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 444c5e80..a611073c 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)}') |