Commit 35e82726 authored by Steven Pisarski's avatar Steven Pisarski
Browse files

Merge branch 'master' of https://gerrit.opnfv.org/gerrit/apex

# Conflicts:
#	lib/python/apex/network_settings.py
#	tests/test_apex_python_utils_py.py
parents e2c20f0f 234ed195
......@@ -20,8 +20,9 @@ IRC: Server:freenode.net Channel:#opnfv-apex
Repository: apex
Committers:
dradez@redhat.com
trozet@redhat.com
michapma@redhat.com
Dan Radez (dradez@redhat.com)
Tim Rozet (trozet@redhat.com)
Michael Chapman (michapma@redhat.com)
Feng Pan (fpan@redhat.com)
Link to TSC approval of the project: http://ircbot.wl.linuxfoundation.org/meetings/opnfv-meeting/2015/opnfv-meeting.2015-07-14-14.00.html
......@@ -12,7 +12,7 @@ export CENTDNLD = http://mirrors.cat.pdx.edu/centos/7.2.1511/isos/x86_64/CentOS-
export CENTISO = $(shell pwd)/$(shell basename $(CENTDNLD))
export RELEASE = "0"
export ISO = $(shell pwd)/release/OPNFV-CentOS-7-x86_64-${RELEASE}.iso
export RPMVERS = $(shell grep Version $(shell pwd)/opnfv-apex.spec | head -n 1 | awk '{ print $$2 }')
export RPMVERS = $(shell grep Version $(shell pwd)/rpm_specs/opnfv-apex.spec | head -n 1 | awk '{ print $$2 }')
export RPMCOM = $(shell pwd)/noarch/opnfv-apex-common-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
export RPMUDR = $(shell pwd)/noarch/opnfv-apex-undercloud-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
export RPMODL = $(shell pwd)/noarch/opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
......@@ -27,7 +27,7 @@ all_networks="admin_network private_network storage_network external_network api
all: iso
.PHONY: clean
clean: images-clean rpms-clean iso-clean tacker-clean congress-clean
clean: images-clean rpms-clean iso-clean tacker-clean congress-clean vpp-clean
.PHONY: images
images: undercloud overcloud-full overcloud-opendaylight overcloud-onos overcloud-opendaylight-sfc
......@@ -50,7 +50,7 @@ opnfv-apex-common.tar.gz:
.PHONY: common-rpm-check
common-rpm-check: opnfv-apex-common.tar.gz
rpmbuild --clean -bi -bl 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 '_-')"
rpmbuild --clean -bi -bl rpm_specs/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 '_-')"
.PHONY: common-rpm
common-rpm: opnfv-apex-common.tar.gz $(RPMCOM)
......@@ -58,7 +58,7 @@ common-rpm: opnfv-apex-common.tar.gz $(RPMCOM)
$(RPMCOM):
@echo "Building the Apex Common RPM"
# 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 '_-')"
rpmbuild --clean -ba rpm_specs/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 #
......@@ -89,11 +89,33 @@ openstack-tacker.tar.gz:
tar czf openstack-tacker.tar.gz openstack-tacker-2015.2
.PHONY: tacker-rpm
tacker-rpm: openstack-tacker.tar.gz openstack-tacker-2015.2-1.noarch.rpm
tacker-rpm: openstack-tacker.tar.gz openstack-tacker-2015.2-1.trozet.noarch.rpm
openstack-tacker-2015.2-1.noarch.rpm:
openstack-tacker-2015.2-1.trozet.noarch.rpm:
@echo "Building the Tacker RPM"
rpmbuild --clean -bb --target noarch openstack-tacker.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`)'
rpmbuild --clean -bb --target noarch rpm_specs/openstack-tacker.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`)'
#################
# TACKERCLIENT #
#################
.PHONY: tackerclient-clean
tackerclient-clean:
@rm -rf python-tackerclient-2015.2
@rm -f python-tackerclient.tar.gz
python-tackerclient.tar.gz:
@echo "Preparing the TackerClient RPM prerequisites"
git clone http://github.com/trozet/python-tackerclient -b SFC_refactor python-tackerclient-2015.2
tar czf python-tackerclient.tar.gz python-tackerclient-2015.2
.PHONY: tackerclient-rpm
tackerclient-rpm: python-tackerclient.tar.gz python-tackerclient-2015.2-1.trozet.noarch.rpm
python-tackerclient-2015.2-1.trozet.noarch.rpm:
@echo "Building the TackerClient RPM"
rpmbuild --clean -bb --target noarch rpm_specs/python-tackerclient.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`)'
###############
# CONGRESS #
......@@ -116,7 +138,34 @@ congress-rpm: openstack-congress.tar.gz openstack-congress-2016.1-1.noarch.rpm
openstack-congress-2016.1-1.noarch.rpm:
@echo "Building the Congress RPM"
rpmbuild --clean -bb --target noarch openstack-congress.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`)'
rpmbuild --clean -bb --target noarch rpm_specs/openstack-congress.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`)'
###############
# VPP #
###############
VPP_DIR = vpp
.PHONY: vpp-clean
vpp-clean:
@rm -f vpp-bin.tar.gz
@rm -rf vpp-bin vpp
.PHONY: vpp-build
vpp-build: vpp-bin.tar.gz
vpp-bin.tar.gz: vpp
$(MAKE) -C $(VPP_DIR) UNATTENDED=yes install-dep bootstrap build pkg-rpm
$(MAKE) -C $(VPP_DIR)/build-root PLATFORM=vpp TAG=vpp_debug vpp-api-install
pushd vpp/vpp-api/python && python setup.py bdist
mkdir vpp-bin
mv vpp/build-root/*.rpm vpp-bin/
mv vpp/vpp-api/python/dist/*.tar.gz vpp-bin/
tar czf vpp-bin.tar.gz vpp-bin
vpp:
git clone https://gerrit.fd.io/r/vpp
###############
# UNDERCLOUD #
......@@ -129,7 +178,7 @@ undercloud-clean:
.PHONY: undercloud
undercloud: images/undercloud.qcow2
images/undercloud.qcow2:
images/undercloud.qcow2: tackerclient-rpm
@echo "Building the Apex Undercloud Image"
@./undercloud.sh
......@@ -142,14 +191,14 @@ opnfv-apex-undercloud.tar.gz: images/undercloud.qcow2
.PHONY: undercloud-rpm-check
undercloud-rpm-check: opnfv-apex-undercloud.tar.gz
rpmbuild --clean -bi -bl opnfv-apex-undercloud.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 '_-')"
rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-undercloud.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 '_-')"
.PHONY: undercloud-rpm
undercloud-rpm: opnfv-apex-undercloud.tar.gz $(RPMUDR)
$(RPMUDR):
@echo "Building the Apex Undercloud RPM"
rpmbuild --clean -ba opnfv-apex-undercloud.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 '_-')"
rpmbuild --clean -ba rpm_specs/opnfv-apex-undercloud.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 '_-')"
###############
# OVERCLOUD #
......@@ -163,7 +212,7 @@ overcloud-full-clean:
.PHONY: overcloud-full
overcloud-full: images/overcloud-full.qcow2
images/overcloud-full.qcow2: tacker-rpm congress-rpm
images/overcloud-full.qcow2: tacker-rpm tackerclient-rpm congress-rpm vpp-build
@echo "Building the Apex Base Overcloud Image"
@./overcloud-full.sh
......@@ -187,7 +236,7 @@ opnfv-apex.tar.gz: images/overcloud-full-opendaylight.qcow2
.PHONY: opendaylight-rpm-check
opendaylight-rpm-check: opnfv-apex.tar.gz
rpmbuild --clean -bi -bl opnfv-apex.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 '_-')"
rpmbuild --clean -bi -bl rpm_specs/opnfv-apex.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 '_-')"
.PHONY: opendaylight-rpm
opendaylight-rpm: opnfv-apex.tar.gz $(RPMODL)
......@@ -195,7 +244,7 @@ opendaylight-rpm: opnfv-apex.tar.gz $(RPMODL)
$(RPMODL):
@echo "Building the Apex OpenDaylight RPM"
# build the overcloud RPM
rpmbuild --clean -ba opnfv-apex.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 '_-')"
rpmbuild --clean -ba rpm_specs/opnfv-apex.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 '_-')"
###############
# ONOS #
......@@ -216,14 +265,14 @@ images/overcloud-full-onos.qcow2: images/overcloud-full.qcow2
.PHONY: onos-rpm-clean
onos-rpm-clean:
@rpmbuild --clean opnfv-apex-onos.spec -D "release $(shell echo $RELEASE | tr -d '_-')"
@rpmbuild --clean rpm_specs/opnfv-apex-onos.spec -D "release $(shell echo $RELEASE | tr -d '_-')"
opnfv-apex-onos.tar.gz: images/overcloud-full-onos.qcow2
tar -czf opnfv-apex-onos.tar.gz --xform="s:images/overcloud-full-onos.qcow2:opnfv-apex-onos-$(RPMVERS)/build/images/overcloud-full-onos.qcow2:" images/overcloud-full-onos.qcow2
.PHONY: onos-rpm-check
onos-rpm-check: opnfv-apex-onos.tar.gz
rpmbuild --clean -bi -bl opnfv-apex-onos.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 '_-')"
rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-onos.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 '_-')"
.PHONY: onos-rpm
onos-rpm: opnfv-apex-onos.tar.gz $(RPMONO)
......@@ -231,7 +280,7 @@ onos-rpm: opnfv-apex-onos.tar.gz $(RPMONO)
$(RPMONO):
@echo "Building the Apex ONOS RPM"
# build the overcloud RPM
rpmbuild --clean -ba opnfv-apex-onos.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 '_-')"
rpmbuild --clean -ba rpm_specs/opnfv-apex-onos.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 '_-')"
###############
# ODL-SFC #
......@@ -253,14 +302,14 @@ opnfv-apex-opendaylight-sfc.tar.gz: images/overcloud-full-opendaylight-sfc.qcow2
.PHONY: opendaylight-sfc-rpm-check
opendaylight-sfc-rpm-check: opnfv-apex-opendaylight-sfc.tar.gz
rpmbuild --clean -bi -bl opnfv-apex-opendaylight-sfc.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 '_-')"
rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-opendaylight-sfc.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 '_-')"
.PHONY: opendaylight-sfc-rpm
opendaylight-sfc-rpm: opnfv-apex-opendaylight-sfc.tar.gz $(RPMSFC)
$(RPMSFC):
@echo "Building the Apex OpenDaylight SFC RPM"
rpmbuild --clean -ba opnfv-apex-opendaylight-sfc.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 '_-')"
rpmbuild --clean -ba rpm_specs/opnfv-apex-opendaylight-sfc.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 '_-')"
###############
# ISO #
......@@ -321,9 +370,9 @@ 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 python-jinja2-2.8-5.fc24.src.rpm
......
......@@ -6,6 +6,8 @@ parameters:
OvercloudControlFlavor: control
OvercloudComputeFlavor: compute
ControllerEnableSwiftStorage: false
NeutronEnableForceMetadata: true
NeutronEnableDHCPMetadata: true
# CloudDomain:
EnableSahara: false
EnableTacker: true
......@@ -22,3 +24,5 @@ parameters:
key: 'os_compute_api:servers:show:host_status'
value: 'rule:admin_or_owner'
parameter_defaults:
CeilometerStoreEvents: true
......@@ -46,7 +46,7 @@ pushd images > /dev/null
dpdk_pkg_str=''
for package in ${dpdk_rpms[@]}; do
curl -O "$dpdk_uri_base/$package"
wget "$dpdk_uri_base/$package"
dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms"
done
......@@ -58,21 +58,13 @@ git archive --format=tar.gz --prefix=congress/ origin/stable/mitaka > ../puppet-
popd > /dev/null
# create fd.io yum repo file
cat > /tmp/fdio-master.repo << EOF
[fdio-master]
name=fd.io master branch latest merge
baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7/
enabled=1
gpgcheck=0
EOF
cat > /tmp/tacker.repo << EOF
[tacker-trozet]
name=Tacker RPMs built from https://github.com/trozet/ tacker repositories
baseurl=http://radez.fedorapeople.org/tacker/
enabled=1
gpgcheck=0
EOF
#cat > /tmp/fdio-master.repo << EOF
#[fdio-master]
#name=fd.io master branch latest merge
#baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7/
#enabled=1
#gpgcheck=0
#EOF
# tar up the fd.io module
rm -rf puppet-fdio
......@@ -104,7 +96,6 @@ popd > /dev/null
# install fd.io yum repo and packages
# upload puppet fdio
# git clone vsperf into the overcloud image
# upload tacker repo and install the packages
# upload the tacker puppet module and untar it
LIBGUESTFS_BACKEND=direct virt-customize \
--upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \
......@@ -127,19 +118,23 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \
--run-command "cd /usr/lib/python2.7/site-packages/congress/datasources && curl -O $doctor_driver" \
--run-command "sed -i \"s/'--detailed-exitcodes',/'--detailed-exitcodes','-l','syslog','-l','console',/g\" /var/lib/heat-config/hooks/puppet" \
--upload /tmp/fdio-master.repo:/etc/yum.repos.d/fdio-master.repo \
--install unzip,vpp,honeycomb \
--upload ../vpp-bin.tar.gz:/root \
--run-command "cd /root && tar zxvf vpp-bin.tar.gz" \
--run-command "yum install -y /root/vpp-bin/*.rpm" \
--run-command "tar zxvf /root/vpp-bin/vpp_papi*.tar.gz -C /" \
--install unzip \
--upload puppet-fdio.tar.gz:/etc/puppet/modules \
--run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \
--upload vsperf.tar.gz:/var/opt \
--run-command "cd /var/opt && tar xzf vsperf.tar.gz" \
--upload /tmp/tacker.repo:/etc/yum.repos.d/ \
--install "python-tackerclient" \
--upload ../noarch/openstack-tacker-2015.2-1.noarch.rpm:/root/ \
--install /root/openstack-tacker-2015.2-1.noarch.rpm \
--upload ../noarch/python-tackerclient-2015.2-1.trozet.noarch.rpm:/root/ \
--install /root/python-tackerclient-2015.2-1.trozet.noarch.rpm \
--upload ../noarch/openstack-tacker-2015.2-1.trozet.noarch.rpm:/root/ \
--install /root/openstack-tacker-2015.2-1.trozet.noarch.rpm \
--upload puppet-tacker.tar.gz:/etc/puppet/modules/ \
--run-command "cd /etc/puppet/modules/ && tar xzf puppet-tacker.tar.gz" \
--run-command "yum install -y https://dl.dropboxusercontent.com/u/7079970/rabbitmq-server-3.6.3-5.el7ost.noarch.rpm" \
--run-command "pip install python-senlinclient" \
-a overcloud-full_build.qcow2
mv -f overcloud-full_build.qcow2 overcloud-full.qcow2
......
......@@ -19,8 +19,8 @@ cp -f overcloud-full.qcow2 overcloud-full-onos_build.qcow2
#######################################
# upgrade ovs into ovs 2.5.90 with NSH function
curl -L -O ${onos_ovs_uri}/package_ovs_rpm2.tar.gz
tar -xzf package_ovs_rpm2.tar.gz
curl -L -O ${onos_ovs_uri}/${onos_ovs_pkg}
tar -xzf ${onos_ovs_pkg}
LIBGUESTFS_BACKEND=direct virt-customize --upload ${ovs_kmod_rpm_name}:/root/ \
--run-command "yum install -y /root/${ovs_kmod_rpm_name}" \
--upload ${ovs_rpm_name}:/root/ \
......
......@@ -20,8 +20,8 @@ cp -f overcloud-full-opendaylight.qcow2 overcloud-full-opendaylight-sfc_build.qc
# upgrade ovs into ovs 2.5.90 with NSH function
if ! [[ -f "$ovs_rpm_name" && -f "$ovs_kmod_rpm_name" ]]; then
curl -L -O ${onos_ovs_uri}/package_ovs_rpm2.tar.gz
tar -xzf package_ovs_rpm2.tar.gz
curl -L -O ${onos_ovs_uri}/${onos_ovs_pkg}
tar -xzf ${onos_ovs_pkg}
fi
LIBGUESTFS_BACKEND=direct virt-customize --upload ${ovs_kmod_rpm_name}:/root/ \
......
......@@ -18,6 +18,13 @@ cp -f overcloud-full.qcow2 overcloud-full-opendaylight_build.qcow2
##### Adding OpenDaylight to overcloud #####
###############################################
# tar up fdio networking-odl
rm -rf fds
git clone https://gerrit.opnfv.org/gerrit/fds
pushd fds > /dev/null
tar -czvf ../networking-odl.tar.gz networking-odl
popd > /dev/null
# Beryllium Repo
cat > /tmp/opendaylight.repo << EOF
[opendaylight-4-release]
......@@ -39,10 +46,20 @@ EOF
# SDNVPN - Copy tunnel setup script
wget https://raw.githubusercontent.com/openstack/fuel-plugin-opendaylight/brahmaputra-sr2/deployment_scripts/puppet/modules/opendaylight/templates/setup_TEPs.py
# tar up the honeycomb module
rm -rf puppet-honeycomb
git clone https://github.com/trozet/puppet-honeycomb
pushd puppet-honeycomb > /dev/null
git archive --format=tar.gz --prefix=honeycomb/ HEAD > ../puppet-honeycomb.tar.gz
popd > /dev/null
# install ODL packages
# install Jolokia for ODL HA
# Patch in OPNFV custom puppet-tripleO
# install Honeycomb
# install Honeycomb puppet module
LIBGUESTFS_BACKEND=direct virt-customize \
--upload networking-odl.tar.gz:/root/ \
--upload /tmp/opendaylight_boron.repo:/etc/yum.repos.d/opendaylight.repo \
--run-command "yum install --downloadonly --downloaddir=/root/boron/ opendaylight" \
--upload /tmp/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
......@@ -50,6 +67,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \
--run-command "wget https://github.com/rhuss/jolokia/releases/download/v1.3.3/jolokia-1.3.3-bin.tar.gz -O /tmp/jolokia-1.3.3-bin.tar.gz" \
--run-command "tar -xvf /tmp/jolokia-1.3.3-bin.tar.gz -C /opt/opendaylight/system/org" \
--run-command "yum -y install https://github.com/marosmars/files/raw/master/honeycomb-1.0.0-99.noarch.rpm" \
--upload puppet-honeycomb.tar.gz:/etc/puppet/modules \
--run-command "cd /etc/puppet/modules && tar xzf puppet-honeycomb.tar.gz" \
--upload ./setup_TEPs.py:/tmp \
-a overcloud-full-opendaylight_build.qcow2
......
......@@ -2,7 +2,7 @@
Name: openstack-tacker
Version: 2015.2
Release: 1
Release: 1.trozet
Summary: OpenStack servicevm/device manager
Group: Applications/Internet
......
......@@ -22,7 +22,7 @@ https://wiki.opnfv.org/apex
%setup -q
%build
rst2html docs/installation-instructions/index.rst docs/installation-instructions.html
rst2html docs/installationprocedure/index.rst docs/installation-instructions.html
rst2html docs/release-notes/release-notes.rst docs/release-notes.html
%global __python %{__python3}
......@@ -131,11 +131,11 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
%doc %{_docdir}/opnfv/inventory.yaml.example
%changelog
* Thu Aug 1 2016 Tim Rozet <trozet@redhat.com> - 3.0-11
* Mon Aug 1 2016 Tim Rozet <trozet@redhat.com> - 3.0-11
- Add nosdn fdio scenarios.
* Tue Jul 5 2016 Dan Radez <dradez@redhat.com> - 3.0-10
- Adding functions.sh files
* Thu Jun 15 2016 Tim Rozet <trozet@redhat.com> - 3.0-9
* Wed Jun 15 2016 Tim Rozet <trozet@redhat.com> - 3.0-9
- Add fdio scenarios.
* Tue Jun 14 2016 Feng Pan <fpan@redhat.com> - 3.0-8
- Add network_settings_v6.yaml
......
%define debug_package %{nil}
Name: python-tackerclient
Version: 2015.2
Release: 1.trozet
Summary: CLI and Client Library for OpenStack Networking
Group: Applications/Internet
License: Apache 2.0
URL: https://wiki.openstack.org/wiki/Tacker/Installation
Source0: python-tackerclient.tar.gz
BuildArch: noarch
BuildRequires: python-setuptools
#Requires: stevedore>=1.5.0 http oslo.config>=1.11.0 oslo.messaging!=1.17.0!=1.17.1>=1.16.0 oslo.rootwrap>=2.0.0 python-novaclient>=2.22.0
%description
CLI and Client Library for OpenStack Networking
%prep
%setup -q
%build
rm requirements.txt
#/usr/bin/python setup.py build
%install
/usr/bin/python setup.py install --prefix=%{buildroot} --install-lib=%{buildroot}/usr/lib/python2.7/site-packages
#rm -rf %{buildroot}/usr/lib/python2.7/site-packages/tacker/tests
%files
/bin/tacker
/usr/lib/python2.7/site-packages/tackerclient/*
/usr/lib/python2.7/site-packages/python_tackerclient-*
%changelog
......@@ -22,14 +22,6 @@ pushd opnfv-tht > /dev/null
git archive --format=tar.gz --prefix=openstack-tripleo-heat-templates/ HEAD > ../opnfv-tht.tar.gz
popd > /dev/null
cat > /tmp/tacker.repo << EOF
[tacker-trozet]
name=Tacker RPMs built from https://github.com/trozet/ tacker repositories
baseurl=http://radez.fedorapeople.org/tacker/
enabled=1
gpgcheck=0
EOF
pushd images > /dev/null
# installing forked opnfv-tht
# enabling ceph OSDs to live on the controller
......@@ -60,8 +52,12 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "sed -i '/PASSWORD_NAMES =/a\\ \"OVERCLOUD_TACKER_PASSWORD\",' /usr/lib/python2.7/site-packages/tripleoclient/utils.py" \
--run-command "sed -i '/AodhPassword/a\\ parameters\[\x27TackerPassword\x27\] = passwords\[\x27OVERCLOUD_TACKER_PASSWORD\x27\]' /usr/lib/python2.7/site-packages/tripleoclient/v1/overcloud_deploy.py" \
--run-command "sed -i '/^SERVICES/a\ \x27tacker\x27: {\x27description\x27: \x27Tacker Service\x27, \x27type\x27: \x27servicevm\x27, \x27path\x27: \x27/\x27, \x27port\x27: 1789 },' /usr/lib/python2.7/site-packages/os_cloud_config/keystone.py" \
--upload /tmp/tacker.repo:/etc/yum.repos.d/ \
--install "python-tackerclient" \
--upload ../noarch/python-tackerclient-2015.2-1.trozet.noarch.rpm:/root/ \
--install /root/python-tackerclient-2015.2-1.trozet.noarch.rpm \
--install "python2-aodhclient" \
--install "openstack-heat-engine" \
--install "openstack-heat-api-cfn" \
--install "openstack-heat-api" \
-a undercloud_build.qcow2
# Add custom IPA to allow kernel params
......
......@@ -12,16 +12,17 @@ rdo_images_uri=https://ci.centos.org/artifacts/rdo/images/mitaka/delorean/stable
onos_release_uri=https://downloads.onosproject.org/nightly/
onos_release_file=onos-1.6.0-rc2.tar.gz
onos_jdk_uri=https://www.dropbox.com/s/qyujpib8zyhzeev
onos_ovs_uri=https://www.dropbox.com/s/2dyd8zyt2l6p586
onos_ovs_uri=https://www.dropbox.com/s/ojknqcozb2w6z3l
onos_ovs_pkg=package_ovs_rpm3.tar.gz
doctor_driver=https://raw.githubusercontent.com/openstack/congress/master/congress/datasources/doctor_driver.py
dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv
dpdk_rpms=(
'ovs4opnfv-32930523-dpdk-16.04.0-1.el7.centos.x86_64.rpm'
'ovs4opnfv-32930523-dpdk-devel-16.04.0-1.el7.centos.x86_64.rpm'
'ovs4opnfv-32930523-dpdk-examples-16.04.0-1.el7.centos.x86_64.rpm'
'ovs4opnfv-32930523-dpdk-tools-16.04.0-1.el7.centos.x86_64.rpm'
'ovs4opnfv-32930523-openvswitch-2.5.90-0.12032.gitc61e93d6.1.el7.centos.x86_64.rpm'
'ovs4opnfv-55ef39e7-dpdk-16.04.0-1.el7.centos.x86_64.rpm'
'ovs4opnfv-55ef39e7-dpdk-devel-16.04.0-1.el7.centos.x86_64.rpm'
'ovs4opnfv-55ef39e7-dpdk-examples-16.04.0-1.el7.centos.x86_64.rpm'
'ovs4opnfv-55ef39e7-dpdk-tools-16.04.0-1.el7.centos.x86_64.rpm'
'ovs4opnfv-55ef39e7-openvswitch-2.5.90-0.12032.gitc61e93d6.1.el7.centos.x86_64.rpm'
)
ovs_rpm_name=openvswitch-2.5.90-1.el7.centos.x86_64.rpm
......
......@@ -20,3 +20,13 @@
41,Add pcs cleanup exec
50,Fix rabbitmq ipv6 config
52,Add notifier topic to ceilometer
53,Add numa to controller hiera hierarchy
54,fix network mtu
56,fixes tacker config for heat_uri
57,Remove trailing newline from dpdk pci address
58,Enable Ceph on boot
61,Add dpdk bind lock file for vpp deployment
63,Fixes honeycomb on compute
62,Heat Domain
64,Fix missing metadata param
65,Add nic list and ip address to fdio class
\ No newline at end of file
......@@ -120,19 +120,19 @@ if [[ "$MAKE_TARGETS" == "images" ]]; then
MAKE_TARGETS+=" rpms-check"
else
# Spec files are selective
if [[ $commit_file_list == *build/opnfv-apex-undercloud.spec* ]]; then
if [[ $commit_file_list == *build/rpm_specs/opnfv-apex-undercloud.spec* ]]; then
MAKE_TARGETS+=" undercloud-rpm-check"
fi
if [[ $commit_file_list == *build/opnfv-apex-common.spec* ]]; then
if [[ $commit_file_list == *build/rpm_specs/opnfv-apex-common.spec* ]]; then
MAKE_TARGETS+=" common-rpm-check"
fi
if [[ $commit_file_list == *build/opnfv-apex.spec* ]]; then
if [[ $commit_file_list == *build/rpm_specs/opnfv-apex.spec* ]]; then
MAKE_TARGETS+=" opendaylight-rpm-check"
fi
if [[ $commit_file_list == *build/opnfv-apex-onos.spec* ]]; then
if [[ $commit_file_list == *build/rpm_specs/opnfv-apex-onos.spec* ]]; then
MAKE_TARGETS+=" onos-rpm-check"
fi
if [[ $commit_file_list == *build/opnfv-apex-opendaylight-sfc.spec* ]]; then
if [[ $commit_file_list == *build/rpm_specs/opnfv-apex-opendaylight-sfc.spec* ]]; then
MAKE_TARGETS+=" opendaylight-sfc-rpm-check"
fi
fi
......
......@@ -26,6 +26,7 @@ interactive="FALSE"
ping_site="8.8.8.8"
ntp_server="pool.ntp.org"
net_isolation_enabled="TRUE"
net_isolation_arg=""
post_config="TRUE"
debug="FALSE"
......@@ -44,7 +45,7 @@ OPNFV_NETWORK_TYPES="admin_network private_network public_network storage_networ
VM_CPUS=4
VM_RAM=8
VM_COMPUTES=2
VM_COMPUTES=1
# Netmap used to map networks to OVS bridge names
NET_MAP['admin_network']="br-admin"
......@@ -130,6 +131,7 @@ parse_cmdline() {
;;
--flat )
net_isolation_enabled="FALSE"
net_isolation_arg="--flat"
echo "Underlay Network Isolation Disabled: using flat configuration"
shift 1
;;
......@@ -211,16 +213,16 @@ parse_cmdline() {
main() {
parse_cmdline "$@"
if [ -n "$DEPLOY_SETTINGS_FILE" ]; then
echo -e "${blue}INFO: Parsing deploy settings file...${reset}"
parse_deploy_settings
fi
echo -e "${blue}INFO: Parsing network settings file...${reset}"
parse_network_settings
if ! configure_deps; then
echo -e "${red}Dependency Validation Failed, Exiting.${reset}"
exit 1
fi
if [ -n "$DEPLOY_SETTINGS_FILE" ]; then
echo -e "${blue}INFO: Parsing deploy settings file...${reset}"
parse_deploy_settings
fi
setup_undercloud_vm
if [ "$virtual" == "TRUE" ]; then
setup_virtual_baremetal $VM_CPUS $VM_RAM
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment