Merge "Missed an update to swap neutron out for openstack cli"

diff --git a/build/Makefile b/build/Makefile
index 5ed9d0a..38f46fd 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -271,9 +271,7 @@ iso:        iso-clean images rpms $(CENTISO)
        @ln $(RPMUDR) $(BUILD_DIR)/centos/Packages
        @ln $(RPMODL) $(BUILD_DIR)/centos/Packages
        # add packages to the centos packages
-       cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch openstack-tripleo jq python34 python34-libs python34-PyYAML python34-setuptools ipxe-roms-qemu
-       cd $(BUILD_DIR)/centos/Packages && curl -O https://radez.fedorapeople.org/python34-markupsafe-0.23-9.el7.centos.x86_64.rpm
-       cd $(BUILD_DIR)/centos/Packages && curl -O https://radez.fedorapeople.org/python3-jinja2-2.8-5.el7.centos.noarch.rpm
+       cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch jq python34 python34-libs python34-PyYAML python34-setuptools ipxe-roms-qemu python34-jinja2 python34-markupsafe
        cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python3-ipmi-0.3.0-1.noarch.rpm
        # regenerate yum repo data
        @echo "Generating new yum metadata"
@@ -284,36 +282,6 @@ iso:       iso-clean images rpms $(CENTISO)
        isohybrid $(ISO)
        @printf "\n\nISO is built at $(ISO)\n\n"
 
-####################
-#  python3-jinja2  #
-####################
-
-.PHONY: python3-jinja2
-python3-jinja2: python3-markupsafe
-       cd $(BUILD_DIR) \
-       && curl -O -L artifacts.opnfv.org/apex/dependencies/python-jinja2-2.8-5.fc24.src.rpm \
-       && rpm2cpio python-jinja2-2.8-5.fc24.src.rpm | cpio -idmv \
-       && sed -i 's/python3-devel/python34-devel/' python-jinja2.spec \
-       && sed -i 's/python3-setuptools/python34-setuptools/' python-jinja2.spec \
-       && sed -i 's/python3-pytest/python34-pytest/' python-jinja2.spec \
-       && sed -i 's/python3-markupsafe/python34-markupsafe/' python-jinja2.spec \
-       && rpmbuild -ba python-jinja2.spec $(RPM_DIR_ARGS) -D "with_python3 1"
-
-########################
-#  python3-markupsafe  #
-########################
-
-.PHONY: python3-markupsafe
-python3-markupsafe:
-       cd $(BUILD_DIR) \
-       && curl -O -L artifacts.opnfv.org/apex/dependencies/python-markupsafe-0.23-9.fc24.src.rpm \
-       && rpm2cpio python-markupsafe-0.23-9.fc24.src.rpm | cpio -idmv \
-       && sed -i 's/python3-devel/python34-devel/' python-markupsafe.spec \
-       && sed -i 's/python3-setuptools/python34-setuptools/' python-markupsafe.spec \
-       && sed -i 's/python3-pytest/python34-pytest/' python-markupsafe.spec \
-       && sed -i 's/python3-markupsafe/python34-markupsafe/' python-markupsafe.spec \
-       && rpmbuild -ba python-markupsafe.spec $(RPM_DIR_ARGS) -D "with_python3 1"
-
 ##################
 #  Quagga Clean  #
 ##################

diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
index bb7e1e2..05fbbbd 100644 (file)
--- a/build/rpm_specs/opnfv-apex-common.spec
+++ b/build/rpm_specs/opnfv-apex-common.spec
@@ -10,7 +10,7 @@ Source0:      opnfv-apex-common.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  python-docutils python34-devel
-Requires:       opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools
+Requires:       opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools libvirt-python
 Requires:       initscripts net-tools iputils iproute iptables python34 python34-yaml python3-jinja2 python3-ipmi python2-virtualbmc
 Requires:       ipxe-roms-qemu >= 20160127-1
 

diff --git a/ci/dev_dep_check.sh b/ci/dev_dep_check.sh
index 71cea22..fb7ede7 100755 (executable)
--- a/ci/dev_dep_check.sh
+++ b/ci/dev_dep_check.sh
@@ -32,7 +32,7 @@ if ! sudo yum update -y ipxe-roms-qemu; then
 fi
 
 # check for other packages
-for i in epel-release python34-PyYAML openvswitch openstack-tripleo libguestfs \
+for i in epel-release python34-PyYAML openvswitch libguestfs \
          libguestfs-tools-c libvirt-python python2-oslo-config \
          python2-debtcollector python34-devel libxslt-devel \
          libxml2-devel python-virtualbmc; do

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index adaf98a..cdf9de0 100755 (executable)
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -328,8 +328,11 @@ EOI
   DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute"
   if [[ "$virtual" == "TRUE" ]]; then
      DEPLOY_OPTIONS+=" -e virtual-environment.yaml"
-     # double check the status of the vbmc devices
-     # TODO add some validation logic here
+     echo 'Ensuring Virtual BMC device status'
+     for i in $(vbmc list | grep down | awk '{ print $2}'); do
+         vbmc start $i
+         sleep 5
+     done
      vbmc list
   fi