summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apex/deploy.py4
-rw-r--r--build/Makefile19
-rwxr-xr-xbuild/overcloud-opendaylight.sh1
-rw-r--r--build/rpm_specs/opnfv-apex-common.spec11
-rw-r--r--build/rpm_specs/opnfv-apex.spec4
-rwxr-xr-xci/clean.sh2
-rw-r--r--docs/release/installation/baremetal.rst24
-rw-r--r--lib/ansible/playbooks/build_dependencies.yml10
-rw-r--r--requirements.txt2
9 files changed, 46 insertions, 31 deletions
diff --git a/apex/deploy.py b/apex/deploy.py
index 76708e96..ceef160a 100644
--- a/apex/deploy.py
+++ b/apex/deploy.py
@@ -291,8 +291,8 @@ def main():
if uc_external:
jump_networks.append('external')
for network in jump_networks:
- iface = net_settings['network'][network]['installer_vm'][
- 'members'](0)
+ iface = net_settings['networks'][network]['installer_vm'][
+ 'members'][0]
bridge = "br-{}".format(network)
jumphost.attach_interface_to_ovs(bridge, iface, network)
# Dump all settings out to temp bash files to be sourced
diff --git a/build/Makefile b/build/Makefile
index 74e72657..edc5832e 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -30,7 +30,7 @@ export QUAGGA_RPMS_DIR = $(QUAGGA_BUILD_DIR)/rpmbuild
export RPM_DIR_ARGS = -D '_topdir $(BUILD_DIR)' -D '_builddir $(BUILD_DIR)' -D '_sourcedir $(BUILD_DIR)' -D '_rpmdir $(BUILD_DIR)' -D '_specdir $(BUILD_DIR)' -D '_srcrpmdir $(BUILD_DIR)'
export RPMREL = $(BUILD_DIR)/noarch/opnfv-apex-release-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
-export RPMCOM = $(BUILD_DIR)/noarch/opnfv-apex-common-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
+export RPMCOM = $(BUILD_DIR)/noarch/python34-opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
export RPMUDR = $(BUILD_DIR)/noarch/opnfv-apex-undercloud-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
export RPMODL = $(BUILD_DIR)/noarch/opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
export RPMONO = $(BUILD_DIR)/noarch/opnfv-apex-onos-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
@@ -49,13 +49,13 @@ clean-cache:
rm -rf $(CACHE_DIR)
.PHONY: images
-images: undercloud overcloud-full overcloud-opendaylight overcloud-onos
+images: undercloud overcloud-full overcloud-opendaylight
.PHONY: rpms
-rpms: images common-rpm undercloud-rpm opendaylight-rpm onos-rpm
+rpms: images common-rpm undercloud-rpm opendaylight-rpm
.PHONY: rpms-check
-rpms-check: release-rpm-check common-rpm-check undercloud-rpm-check opendaylight-rpm-check onos-rpm-check
+rpms-check: release-rpm-check common-rpm-check undercloud-rpm-check opendaylight-rpm-check
.PHONY: rpms-clean
rpms-clean:
@@ -271,8 +271,17 @@ 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 jq python34 python34-libs python34-PyYAML python34-setuptools ipxe-roms-qemu python34-jinja2 python34-markupsafe python2-virtualbmc python-pbr python-prettytable python-pyghmi python-crypto libvirt-python
+ 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
+ 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
+ cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-iptables-0.12.0-1.el7.centos.x86_64.rpm
+ cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-libvirt-3.6.0-1.el7.centos.x86_64.rpm
+ cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-pbr-3.1.1-1.el7.centos.x86_64.rpm
+ cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-PrettyTable-0.7.2-1.el7.centos.noarch.rpm
+ cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-pycrypto-2.6.1-1.el7.centos.x86_64.rpm
+ cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-pyghmi-1.0.22-1.el7.centos.noarch.rpm
+ cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-virtualbmc-1.2.0-1.el7.centos.noarch.rpm
# regenerate yum repo data
@echo "Generating new yum metadata"
createrepo --update -g $(BUILD_ROOT)/c7-opnfv-x86_64-comps.xml $(BUILD_DIR)/centos
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 775fcbfb..96b43d87 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -102,4 +102,5 @@ LIBGUESTFS_BACKEND=direct virt-customize \
fi
LIBGUESTFS_BACKEND=direct virt-sparsify --compress overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2
+rm -f overcloud-full-opendaylight_build.qcow2
popd > /dev/null
diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
index 42bc42f9..37e32145 100644
--- a/build/rpm_specs/opnfv-apex-common.spec
+++ b/build/rpm_specs/opnfv-apex-common.spec
@@ -1,6 +1,6 @@
%global srcname opnfv-apex
-Name: python3-%{srcname}
+Name: python34-%{srcname}
Version: 5.0
Release: %{_release}
Summary: Scripts for OPNFV deployment using Apex
@@ -12,10 +12,11 @@ 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 libvirt-python
-Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python34-jinja2 python3-ipmi python2-virtualbmc
+Requires: opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools python34-libvirt
+Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python34-jinja2 python3-ipmi python34-virtualbmc
Requires: ipxe-roms-qemu >= 20160127-1
-Requires: libvirt-devel
+Requires: libvirt-devel ansible
+Requires: python34-iptables python34-cryptography python34-pbr
%description
Scripts for OPNFV deployment using Apex
@@ -112,6 +113,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
%doc %{_docdir}/opnfv/inventory.yaml.example
%changelog
+* Wed Aug 23 2017 Tim Rozet <trozet@redhat.com> - 5.0-5
+- Updated requirements
* Mon Aug 14 2017 Tim Rozet <trozet@redhat.com> - 5.0-4
- Updated for python refactoring
* Mon May 08 2017 Dan Radez <dradez@redhat.com> - 5.0-3
diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec
index 1e7c5620..fdda3025 100644
--- a/build/rpm_specs/opnfv-apex.spec
+++ b/build/rpm_specs/opnfv-apex.spec
@@ -10,7 +10,7 @@ Source0: opnfv-apex.tar.gz
Provides: opnfv-apex-sdn
BuildArch: noarch
-Requires: opnfv-apex-common opnfv-apex-undercloud
+Requires: python34-opnfv-apex opnfv-apex-undercloud
%description
Overcloud Disk images for OPNFV Apex OpenDaylight deployment
@@ -34,6 +34,8 @@ install build/overcloud-full.initrd %{buildroot}%{_var}/opt/opnfv/images/
%{_var}/opt/opnfv/images/overcloud-full.initrd
%changelog
+* Wed Aug 23 2017 Tim Rozet <trozet@redhat.com> - 5.0-3
+- Updated requirements
* Fri May 26 2017 Tim Rozet <trozet@redhat.com> - 5.0-2
- Fixes missing ramdisk and kernel
* Tue Apr 04 2017 Dan Radez <dradez@redhat.com> - 5.0-1
diff --git a/ci/clean.sh b/ci/clean.sh
index e35b95b1..ef810416 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -165,7 +165,7 @@ if [ -n "$INVENTORY_FILE" ]; then
echo -e "${blue}INFO: Parsing inventory file...${reset}"
# hack for now (until we switch fully over to clean.py) to tell if
# we should install apex from python or if rpm is being used
- if ! rpm -q opnfv-apex-common > /dev/null; then
+ if ! rpm -q python34-opnfv-apex > /dev/null; then
pushd ../ && python3 setup.py install > /dev/null
popd
fi
diff --git a/docs/release/installation/baremetal.rst b/docs/release/installation/baremetal.rst
index 5ac05873..c6ab9e82 100644
--- a/docs/release/installation/baremetal.rst
+++ b/docs/release/installation/baremetal.rst
@@ -124,22 +124,22 @@ Install Bare Metal Jumphost
``sudo yum install opnfv-apex``
- If ONOS will be used, install the ONOS rpm instead of the opnfv-apex rpm.
-
- ``sudo yum install opnfv-apex-onos``
-
2c. If you choose not to use the Apex yum repo or you choose to use
pre-released RPMs you can download and install the required RPMs from the
artifacts site <http://artifacts.opnfv.org/apex.html>. The following RPMs
are available for installation:
- - opnfv-apex - OpenDaylight L2 / L3 and ODL SFC support *
- - opnfv-apex-onos - ONOS support *
- - opnfv-apex-undercloud - (reqed) Undercloud Image
- - opnfv-apex-common - (reqed) Supporting config files and scripts
- - python34-markupsafe - (reqed) Dependency of opnfv-apex-common **
- - python3-jinja2 - (reqed) Dependency of opnfv-apex-common **
- - python3-ipmi - (reqed) Dependency of opnfv-apex-common **
+ - opnfv-apex - OpenDaylight, OVN, and nosdn support *
+ - opnfv-apex-undercloud - (reqed) Undercloud Image
+ - python34-opnfv-apex - (reqed) OPNFV Apex Python package
+ - python34-markupsafe - (reqed) Dependency of python34-opnfv-apex **
+ - python34-jinja2 - (reqed) Dependency of python34-opnfv-apex **
+ - python3-ipmi - (reqed) Dependency of python34-opnfv-apex **
+ - python34-pbr - (reqed) Dependency of python34-opnfv-apex **
+ - python34-virtualbmc - (reqed) Dependency of python34-opnfv-apex **
+ - python34-iptables - (reqed) Dependency of python34-opnfv-apex **
+ - python34-cryptography - (reqed) Dependency of python34-opnfv-apex **
+ - python34-libvirt - (reqed) Dependency of python34-opnfv-apex **
\* One or more of these RPMs is required
Only one of opnfv-apex or opnfv-apex-onos is required. It is safe to leave
@@ -162,7 +162,7 @@ Install Bare Metal Jumphost
``sudo yum install python34-markupsafe-<version>.rpm
python3-jinja2-<version>.rpm python3-ipmi-<version>.rpm``
``sudo yum install opnfv-apex-<version>.rpm
- opnfv-apex-undercloud-<version>.rpm opnfv-apex-common-<version>.rpm``
+ opnfv-apex-undercloud-<version>.rpm python34-opnfv-apex-<version>.rpm``
3. After the operating system and the opnfv-apex RPMs are installed, login to
your Jumphost as root.
diff --git a/lib/ansible/playbooks/build_dependencies.yml b/lib/ansible/playbooks/build_dependencies.yml
index afe12b74..1a7e6c9a 100644
--- a/lib/ansible/playbooks/build_dependencies.yml
+++ b/lib/ansible/playbooks/build_dependencies.yml
@@ -6,13 +6,11 @@
name: 'https://www.rdoproject.org/repos/rdo-release.rpm'
- name: Add dependency packages
yum:
- name: python34,python34-devel,python34-jinja2,
- python34-markupsafe, python2-virtualbmc,
+ name: python34,python34-devel,python34-jinja2,python34-markupsafe,
libguestfs-tools,bsdtar,libvirt,yum-utils,
- python2-oslo-config,python2-debtcollector,
make, python34-pip, python-virtualenv,libguestfs-tools-c,
supermin,supermin5,perl-Sys-Guestfs,python-libguestfs,
- libvirt-devel,python34-docutils,python-docutils
+ libvirt-devel,python34-docutils
- name: Install Virtualization group
yum:
name: "@Virtualization Host"
@@ -28,3 +26,7 @@
- pip:
name: pygerrit2
executable: pip3.4
+ - name: Add python2 pbr only for networking-vpp build
+ pip:
+ name: pbr
+ executable: pip2
diff --git a/requirements.txt b/requirements.txt
index af2a106e..617ec235 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,11 +2,9 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr!=2.1.0,>=2.0.0 # Apache-2.0
-
libvirt-python
python-iptables
virtualbmc
-PyYAML
cryptography
python-ipmi
PyYAML