diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 9 | ||||
| -rw-r--r-- | build/build_perf_image.sh | 4 | ||||
| -rw-r--r-- | build/opnfv-apex-common.spec | 8 | ||||
| -rw-r--r-- | build/opnfv-environment.yaml | 1 | ||||
| -rw-r--r-- | build/set_perf_images.sh | 24 | ||||
| -rwxr-xr-x | build/undercloud.sh | 6 |
6 files changed, 46 insertions, 6 deletions
diff --git a/build/Makefile b/build/Makefile index 8a498a66..4d024a3b 100644 --- a/build/Makefile +++ b/build/Makefile @@ -56,6 +56,15 @@ $(RPMCOM): # build the common RPM rpmbuild --clean -ba opnfv-apex-common.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')" +################## +# PYTHON TESTS # +################## + +.PHONY: python-tests +python-tests: + cd ../tests && ./python-coverage.sh + + ############### # UNDERCLOUD # ############### diff --git a/build/build_perf_image.sh b/build/build_perf_image.sh index 80e615ef..c91b563d 100644 --- a/build/build_perf_image.sh +++ b/build/build_perf_image.sh @@ -33,8 +33,6 @@ if [ "$CATEGORY" == "nova" ]; then fi if [ "$CATEGORY" == "kernel" ]; then - LIBGUESTFS_BACKEND=direct virt-customize \ - --run-command "grubby --update-kernel=ALL --args=$KEY=$VALUE" \ - -a $IMAGE + echo "${KEY}=${VALUE}" >> $ROLE-kernel_params.txt fi diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 327df3bc..fc82fca7 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -34,8 +34,10 @@ install ci/util.sh %{buildroot}%{_bindir}/opnfv-util mkdir -p %{buildroot}%{_sysconfdir}/opnfv-apex/ install config/deploy/os-nosdn-nofeature-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml +install config/deploy/os-nosdn-ovs-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-noha.yaml install config/deploy/os-nosdn-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml install config/deploy/os-nosdn-performance-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml +install config/deploy/os-nosdn-ovs-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml install config/deploy/os-odl_l2-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml install config/deploy/os-odl_l2-sfc-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml install config/deploy/os-odl_l3-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml @@ -59,6 +61,7 @@ install lib/python/apex/common/constants.py %{buildroot}%{python3_sitelib}/apex/ install lib/python/apex/common/utils.py %{buildroot}%{python3_sitelib}/apex/common/ mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/ install lib/installer/onos/onos_gw_mac_update.sh %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/ +install lib/installer/domain.xml %{buildroot}%{_var}/opt/opnfv/lib/installer/ mkdir -p %{buildroot}%{_docdir}/opnfv/ install LICENSE.rst %{buildroot}%{_docdir}/opnfv/ @@ -79,9 +82,12 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_var}/opt/opnfv/lib/python/ %{python3_sitelib}/apex/ %{_var}/opt/opnfv/lib/installer/onos/onos_gw_mac_update.sh +%{_var}/opt/opnfv/lib/installer/domain.xml %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-noha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml @@ -97,6 +103,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Thu Jun 2 2016 Michael Chapman <michapma@redhat.com> - 3.0-7 +- Add custom libvirt domain.xml. * Wed Jun 1 2016 Feng Pan <fpan@redhat.com> - 3.0-6 - Add performance deployment file * Sun May 15 2016 Feng Pan <fpan@redhat.com> - 3.0-5 diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index 57df2d35..54b1e6f2 100644 --- a/build/opnfv-environment.yaml +++ b/build/opnfv-environment.yaml @@ -3,6 +3,7 @@ parameters: controllerImage: overcloud-full + OvercloudControlFlavor: baremetal ControllerEnableSwiftStorage: false EnableSahara: false ExtraConfig: diff --git a/build/set_perf_images.sh b/build/set_perf_images.sh index 2002e6fb..0025cc75 100644 --- a/build/set_perf_images.sh +++ b/build/set_perf_images.sh @@ -2,7 +2,7 @@ ############################################################################## # Copyright (c) 2016 Red Hat Inc. -# Michael Chapman <michapma@redhat.com> +# Michael Chapman <michapma@redhat.com>, Tim Rozet <trozet@redhat.com> # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at @@ -10,22 +10,40 @@ ############################################################################## for ROLE in $@; do + RAMDISK=${ROLE}-bm-deploy-ramdisk + if [ -f $ROLE-overcloud-full.qcow2 ]; then + echo "Uploading ${RAMDISK}" + glance image-create --name ${RAMDISK} --disk-format ari --container-format ari --file ${ROLE}-ironic-python-agent.initramfs --is-public True echo "Uploading $ROLE-overcloud-full.qcow2 " KERNEL=$(glance image-show overcloud-full | grep 'kernel_id' | cut -d '|' -f 3 | xargs) - RAMDISK=$(glance image-show overcloud-full | grep 'ramdisk_id' | cut -d '|' -f 3 | xargs) - glance image-create --name $ROLE-overcloud-full --disk-format qcow2 --file $ROLE-overcloud-full.qcow2 --container-format bare --property ramdisk_id=$RAMDISK --property kernel_id=$KERNEL + RAMDISK_ID=$(glance image-show ${RAMDISK} | grep id | awk {'print $4'}) + glance image-create --name $ROLE-overcloud-full --disk-format qcow2 --file $ROLE-overcloud-full.qcow2 --container-format bare --property ramdisk_id=$RAMDISK_ID --property kernel_id=$KERNEL --is-public True fi if [ "$ROLE" == "Controller" ]; then sed -i "s/overcloud-full/Controller-overcloud-full/" opnfv-environment.yaml + sed -i '/OvercloudControlFlavor:/c\ OvercloudControlFlavor: control' opnfv-environment.yaml fi if [ "$ROLE" == "Compute" ]; then sudo sed -i "s/NovaImage: .*/NovaImage: Compute-overcloud-full/" /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml + sudo sed -i '/OvercloudComputeFlavor:/c\ OvercloudComputeFlavor: compute' /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml fi if [ "$ROLE" == "BlockStorage" ]; then sudo sed -i "s/BlockStorageImage: .*/BlockStorageImage: BlockStorage-overcloud-full/" /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml fi + + RAMDISK_ID=$(glance image-show ${RAMDISK} | grep id | awk {'print $4'}) + nodes=$(ironic node-list | awk {'print $2'} | grep -Eo [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}) + role=$(echo $ROLE | awk '{print tolower($0)}') + if [ "$role" == "controller" ]; then + role="control" + fi + for node in $nodes; do + if ironic node-show $node | grep profile:${role}; then + ironic node-update $node replace driver_info/deploy_ramdisk=${RAMDISK_ID} + fi + done done diff --git a/build/undercloud.sh b/build/undercloud.sh index 04c2667f..f2e98795 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -70,9 +70,15 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ../virtual-environment.yaml:/home/stack/ \ -a undercloud.qcow2 +# Add custom IPA to allow kernel params +wget https://raw.githubusercontent.com/trozet/ironic-python-agent/opnfv_kernel/ironic_python_agent/extensions/image.py +python3.4 -c 'import py_compile; py_compile.compile("image.py", cfile="image.pyc")' + # Add performance image scripts LIBGUESTFS_BACKEND=direct virt-customize --upload ../build_perf_image.sh:/home/stack \ --upload ../set_perf_images.sh:/home/stack \ + --upload image.py:/root \ + --upload image.pyc:/root \ -a undercloud.qcow2 popd > /dev/null |