summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/Makefile5
-rwxr-xr-xbuild/overcloud-full.sh4
-rw-r--r--build/rpm_specs/opnfv-apex-common.spec4
-rw-r--r--build/rpm_specs/opnfv-apex-onos.spec4
-rw-r--r--build/rpm_specs/opnfv-apex-undercloud.spec4
-rw-r--r--build/rpm_specs/opnfv-apex.spec4
6 files changed, 19 insertions, 6 deletions
diff --git a/build/Makefile b/build/Makefile
index 805cf22a..729b3ce9 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -276,6 +276,7 @@ iso: iso-clean images rpms $(CENTISO)
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-python python-lxml python-passlib python2-jmespath
+ cd $(BUILD_DIR)/centos/Packages && yumdownloader python34-urllib3 python34-pysocks python34-requests python34-chardet
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
@@ -286,6 +287,10 @@ iso: iso-clean images rpms $(CENTISO)
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
+ cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-smmap2-2.0.3-1.el7.centos.noarch.rpm
+ cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-pygerrit2-2.0.3-1.el7.centos.noarch.rpm
+ cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-gitdb2-2.0.3-1.el7.centos.noarch.rpm
+ cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-GitPython-2.1.7-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-full.sh b/build/overcloud-full.sh
index 098ab023..1b7843a0 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -109,8 +109,8 @@ cat > ${BUILD_DIR}/kubernetes.repo << EOF
name=Kubernetes
baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
enabled=1
-gpgcheck=1
-repo_gpgcheck=1
+gpgcheck=0
+repo_gpgcheck=0
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg
https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
EOF
diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
index 7b7cac18..dde13a78 100644
--- a/build/rpm_specs/opnfv-apex-common.spec
+++ b/build/rpm_specs/opnfv-apex-common.spec
@@ -1,7 +1,7 @@
%global srcname opnfv-apex
Name: python34-%{srcname}
-Version: 5.0
+Version: 6.0
Release: %{_release}
Summary: Scripts for OPNFV deployment using Apex
@@ -116,6 +116,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
%doc %{_docdir}/opnfv/inventory.yaml.example
%changelog
+* Wed Nov 29 2017 Tim Rozet <trozet@redhat.com> - 6.0-0
+ Bump version for Fraser
* Wed Oct 25 2017 Tim Rozet <trozet@redhat.com> - 5.0-9
- Adds GitPython and pygerrit2 dependencies
* Mon Oct 2 2017 Tim Rozet <trozet@redhat.com> - 5.0-8
diff --git a/build/rpm_specs/opnfv-apex-onos.spec b/build/rpm_specs/opnfv-apex-onos.spec
index 9a0ba571..2d600b98 100644
--- a/build/rpm_specs/opnfv-apex-onos.spec
+++ b/build/rpm_specs/opnfv-apex-onos.spec
@@ -1,5 +1,5 @@
Name: opnfv-apex-onos
-Version: 5.0
+Version: 6.0
Release: %{_release}
Summary: Overcloud Disk images for OPNFV Apex ONOS deployment
@@ -30,6 +30,8 @@ install build/overcloud-full-onos.qcow2 %{buildroot}%{_var}/opt/opnfv/images/
%{_var}/opt/opnfv/images/overcloud-full-onos.qcow2
%changelog
+* Wed Nov 29 2017 Tim Rozet <trozet@redhat.com> - 6.0-0
+ Bump version for Fraser
* Tue Apr 04 2017 Dan Radez <dradez@redhat.com> - 5.0-1
- Version update for Euphrates
* Wed Dec 7 2016 Tim Rozet <trozet@redhat.com> - 4.0-2
diff --git a/build/rpm_specs/opnfv-apex-undercloud.spec b/build/rpm_specs/opnfv-apex-undercloud.spec
index 339fff69..fc3c3ec1 100644
--- a/build/rpm_specs/opnfv-apex-undercloud.spec
+++ b/build/rpm_specs/opnfv-apex-undercloud.spec
@@ -1,5 +1,5 @@
Name: opnfv-apex-undercloud
-Version: 5.0
+Version: 6.0
Release: %{_release}
Summary: Scripts and Disk images to launch the Undercloud for OPNFV Apex
@@ -37,6 +37,8 @@ install build/nics-template.yaml.jinja2 %{buildroot}%{_var}/opt/opnfv/
%changelog
+* Wed Nov 29 2017 Tim Rozet <trozet@redhat.com> - 6.0-0
+ Bump version for Fraser
* Tue Apr 04 2017 Dan Radez <dradez@redhat.com> - 5.0-1
- Version update for Euphrates
* Wed Nov 2 2016 Dan Radez <dradez@redhat.com> - 4.0-1
diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec
index fdda3025..18fafa65 100644
--- a/build/rpm_specs/opnfv-apex.spec
+++ b/build/rpm_specs/opnfv-apex.spec
@@ -1,5 +1,5 @@
Name: opnfv-apex
-Version: 5.0
+Version: 6.0
Release: %{_release}
Summary: 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 Nov 29 2017 Tim Rozet <trozet@redhat.com> - 6.0-0
+ Bump version for Fraser
* 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