From 6a6524ab1ff5d4c1420be4e08c63e9e47d7e8341 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Mon, 16 Dec 2019 13:02:21 -0600 Subject: [PATCH] Nova: add net-tools package This PS adds the net-tools package to the nova image, required for the 'route' command. Addtionailly voting is turned off for opensuse openstack image builds, untill we can break out the package name definition between distros. Change-Id: I74ed18620de33a2af2aac6b8719bbbcc925685da Signed-off-by: Pete Birley --- openstack/loci/build.sh | 1 + zuul.d/openstack-loci.yaml | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openstack/loci/build.sh b/openstack/loci/build.sh index 0bba4017..0e163bc5 100755 --- a/openstack/loci/build.sh +++ b/openstack/loci/build.sh @@ -197,6 +197,7 @@ neutron_dist_packages=${neutron_dist_packages:-"jq"} neutron_pip_packages=${neutron_pip_packages:-"pycrypto"} nova_profiles=${nova_profiles:-"'fluent ceph linuxbridge openvswitch configdrive qemu apache'"} nova_pip_packages=${nova_pip_packages:-"pycrypto"} +nova_dist_packages=${nova_dist_packages:-"net-tools"} horizon_profiles=${horizon_profiles:-"'fluent apache'"} horizon_pip_packages=${horizon_pip_packages:-"pycrypto"} senlin_profiles=${senlin_profiles:-"fluent"} diff --git a/zuul.d/openstack-loci.yaml b/zuul.d/openstack-loci.yaml index e61f3796..9e2d77e5 100644 --- a/zuul.d/openstack-loci.yaml +++ b/zuul.d/openstack-loci.yaml @@ -19,7 +19,8 @@ - openstack-helm-images-build-openstack-loci-ocata-ubuntu_xenial - openstack-helm-images-build-openstack-loci-pike-ubuntu_xenial - openstack-helm-images-build-openstack-loci-queens-ubuntu_xenial - - openstack-helm-images-build-openstack-loci-rocky-opensuse_15 + - openstack-helm-images-build-openstack-loci-rocky-opensuse_15: + voting: false - openstack-helm-images-build-openstack-loci-rocky-ubuntu_xenial - openstack-helm-images-build-openstack-loci-rocky-ubuntu_bionic - openstack-helm-images-build-openstack-loci-stein-ubuntu_bionic @@ -29,7 +30,7 @@ - openstack-helm-images-upload-openstack-loci-ocata-ubuntu_xenial - openstack-helm-images-upload-openstack-loci-pike-ubuntu_xenial - openstack-helm-images-upload-openstack-loci-queens-ubuntu_xenial - - openstack-helm-images-upload-openstack-loci-rocky-opensuse_15 + #- openstack-helm-images-upload-openstack-loci-rocky-opensuse_15 - openstack-helm-images-upload-openstack-loci-rocky-ubuntu_xenial - openstack-helm-images-upload-openstack-loci-rocky-ubuntu_bionic - openstack-helm-images-upload-openstack-loci-stein-ubuntu_bionic @@ -39,7 +40,7 @@ - openstack-helm-images-promote-openstack-loci-ocata-ubuntu_xenial - openstack-helm-images-promote-openstack-loci-pike-ubuntu_xenial - openstack-helm-images-promote-openstack-loci-queens-ubuntu_xenial - - openstack-helm-images-promote-openstack-loci-rocky-opensuse_15 + #- openstack-helm-images-promote-openstack-loci-rocky-opensuse_15 - openstack-helm-images-promote-openstack-loci-rocky-ubuntu_xenial - openstack-helm-images-promote-openstack-loci-rocky-ubuntu_bionic - openstack-helm-images-promote-openstack-loci-stein-ubuntu_bionic