diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 2 | ||||
| -rw-r--r-- | build/opnfv-environment.yaml | 1 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 4 | ||||
| -rwxr-xr-x | build/undercloud.sh | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/build/Makefile b/build/Makefile index ae6fbf85..44e92a8a 100644 --- a/build/Makefile +++ b/build/Makefile @@ -275,7 +275,7 @@ iso: iso-clean images rpms $(CENTISO) cd $(BUILD_DIR)/centos/Packages && yumdownloader python34-jinja2 python34-markupsafe ansible python34-six python34-cffi cd $(BUILD_DIR)/centos/Packages && yumdownloader ipxe-roms-qemu python34-idna python34-pycparser python-crypto python-httplib2 cd $(BUILD_DIR)/centos/Packages && yumdownloader python-jinja2 python-keyczar python-paramiko sshpass python-ecdsa python34-ply - cd $(BUILD_DIR)/centos/Packages && yumdownloader libvirt-client libvirt-python python-lxml + cd $(BUILD_DIR)/centos/Packages && yumdownloader libvirt-client libvirt-python python-lxml python-passlib cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python3-ipmi-0.3.0-1.noarch.rpm cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-asn1crypto-0.22.0-1.el7.centos.noarch.rpm cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-cryptography-2.0.3-1.el7.centos.x86_64.rpm diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index 5b5d4500..7da252ec 100644 --- a/build/opnfv-environment.yaml +++ b/build/opnfv-environment.yaml @@ -132,6 +132,7 @@ parameter_defaults: - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::Vpp + - OS::TripleO::Services::NeutronBgpvpnApi ComputeServices: - OS::TripleO::Services::Barometer - OS::TripleO::Services::CACerts diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 6fdc32d6..06e461f7 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -25,13 +25,13 @@ mv -f ${BUILD_DIR}/overcloud-full.qcow2 ${BUILD_DIR}/overcloud-full_build.qcow2 pushd ${BUILD_DIR} > /dev/null # prep opnfv-puppet-tripleo for undercloud -python3 -B $BUILD_UTILS clone-fork -r apex-puppet-tripleo +python3 -B $BUILD_UTILS clone-fork -r apex-puppet-tripleo -b stable/euphrates pushd apex-puppet-tripleo > /dev/null git archive --format=tar.gz --prefix=tripleo/ HEAD > ${BUILD_DIR}/apex-puppet-tripleo.tar.gz popd > /dev/null # download customized os-net-config -python3 -B $BUILD_UTILS clone-fork -r apex-os-net-config +python3 -B $BUILD_UTILS clone-fork -r apex-os-net-config -b stable/euphrates pushd apex-os-net-config/os_net_config > /dev/null git archive --format=tar.gz --prefix=os_net_config/ HEAD > ${BUILD_DIR}/apex-os-net-config.tar.gz popd > /dev/null diff --git a/build/undercloud.sh b/build/undercloud.sh index 05cbf552..5930c503 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -18,7 +18,7 @@ cp -f ${CACHE_DIR}/undercloud.qcow2 ${BUILD_DIR}/undercloud_build.qcow2 pushd ${BUILD_DIR} > /dev/null # prep apex-tht for undercloud -python3 -B $BUILD_UTILS clone-fork -r apex-tripleo-heat-templates +python3 -B $BUILD_UTILS clone-fork -r apex-tripleo-heat-templates -b stable/euphrates pushd apex-tripleo-heat-templates > /dev/null git archive --format=tar.gz --prefix=openstack-tripleo-heat-templates/ HEAD > ${BUILD_DIR}/apex-tripleo-heat-templates.tar.gz popd > /dev/null @@ -53,6 +53,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_ROOT}/baremetal-environment.yaml:/home/stack/ \ --uninstall "libvirt-client" \ --install "libguestfs-tools" \ + --install "python-tackerclient" \ -a undercloud_build.qcow2 mv -f undercloud_build.qcow2 undercloud.qcow2 |