diff options
Diffstat (limited to 'build')
-rw-r--r-- | build/CentOS-Updates.repo | 5 | ||||
-rw-r--r-- | build/Makefile | 6 | ||||
-rw-r--r-- | build/baremetal-environment.yaml | 1 | ||||
-rwxr-xr-x | build/barometer-install.sh | 26 | ||||
-rw-r--r-- | build/bash_completion_apex | 2 | ||||
-rwxr-xr-x | build/build_ovs_nsh.sh | 7 | ||||
-rw-r--r-- | build/opnfv-environment.yaml | 12 | ||||
-rwxr-xr-x | build/overcloud-full.sh | 6 | ||||
-rwxr-xr-x | build/overcloud-opendaylight.sh | 3 | ||||
-rw-r--r-- | build/rpm_specs/opnfv-apex-common.spec | 3 | ||||
-rwxr-xr-x | build/undercloud.sh | 2 |
11 files changed, 48 insertions, 25 deletions
diff --git a/build/CentOS-Updates.repo b/build/CentOS-Updates.repo new file mode 100644 index 00000000..8fc45d89 --- /dev/null +++ b/build/CentOS-Updates.repo @@ -0,0 +1,5 @@ +#released updates +[updates-old] +name=CentOS-$releasever - Old Updates +baseurl=http://mirror.centos.org/centos/7.3.1611/updates/x86_64/ +gpgcheck=0 diff --git a/build/Makefile b/build/Makefile index 7cc8736e..5f078339 100644 --- a/build/Makefile +++ b/build/Makefile @@ -271,7 +271,11 @@ 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 ansible python34-six python34-cffi python34-idna python34-pycparser python-crypto python-httplib2 python-jinja2 python-keyczar python-paramiko sshpass python-ecdsa python34-ply + cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch jq python34 python34-libs python34-PyYAML python34-setuptools + cd $(BUILD_DIR)/centos/Packages && yumdownloader python34-jinja2 python34-markupsafe ansible python34-six python34-cffi + 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 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 diff --git a/build/baremetal-environment.yaml b/build/baremetal-environment.yaml index 677b313a..c849655e 100644 --- a/build/baremetal-environment.yaml +++ b/build/baremetal-environment.yaml @@ -1,3 +1,4 @@ +--- parameter_defaults: HeatWorkers: 12 CeilometerWorkers: 12 diff --git a/build/barometer-install.sh b/build/barometer-install.sh index de47baff..9e5dfc73 100755 --- a/build/barometer-install.sh +++ b/build/barometer-install.sh @@ -15,11 +15,11 @@ # limitations under the License. # Get and install packages needed for Barometer service. -# These are: collectd rpm's and dependencies, collectd-ceilometer-plugin, +# These are: collectd rpm's and dependencies, collectd-openstack-plugins, # puppet-barometer module. # Versions/branches -COLLECTD_CEILOMETER_PLUGIN_BRANCH="stable/ocata" +COLLECTD_OPENSTACK_PLUGINS_BRANCH="stable/ocata" ARCH="6.el7.centos.x86_64.rpm" # don't fail because of missing certificate @@ -27,7 +27,7 @@ GETFLAG="--no-check-certificate" # Locations of repos ARTIFACTS_BAROM="artifacts.opnfv.org/barometer" -COLLECTD_CEILOMETER_REPO="https://github.com/openstack/collectd-ceilometer-plugin" +COLLECTD_OPENSTACK_REPO="https://github.com/openstack/collectd-ceilometer-plugin" PUPPET_BAROMETER_REPO="https://github.com/johnhinman/puppet-barometer" # upload barometer packages tar, extract, and install @@ -76,12 +76,12 @@ function barometer_pkgs { cp collectd.tar.gz ${BUILD_DIR} popd > /dev/null - # get collectd-ceilometer-plugin and tar it - rm -rf collectd-ceilometer-plugin - git clone https://github.com/openstack/collectd-ceilometer-plugin - pushd collectd-ceilometer-plugin - git checkout -b $COLLECTD_CEILOMETER_PLUGIN_BRANCH - git archive --format=tar.gz HEAD > ${BUILD_DIR}/collectd-ceilometer-plugin.tar.gz + # get collectd-openstack-plugins and tar it + rm -rf collectd-openstack-plugins + git clone $COLLECTD_OPENSTACK_REPO collectd-openstack-plugins + pushd collectd-openstack-plugins + git checkout -b $COLLECTD_OPENSTACK_PLUGINS_BRANCH + git archive --format=tar.gz HEAD > ${BUILD_DIR}/collectd-openstack-plugins.tar.gz popd > /dev/null # get the barometer puppet module and tar it @@ -103,7 +103,7 @@ function barometer_pkgs { # install dependencies LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_DIR}/collectd.tar.gz:/opt/ \ - --upload ${BUILD_DIR}/collectd-ceilometer-plugin.tar.gz:/opt/ \ + --upload ${BUILD_DIR}/collectd-openstack-plugins.tar.gz:/opt/ \ --upload ${BUILD_DIR}/puppet-barometer.tar.gz:/etc/puppet/modules/ \ --run-command 'tar xfz /opt/collectd.tar.gz -C /opt' \ --install libstatgrab,log4cplus,rrdtool,rrdtool-devel \ @@ -133,12 +133,12 @@ function barometer_pkgs { /opt/collectd-virt-${SUFFIX}" \ -a $OVERCLOUD_IMAGE - # install collectd-ceilometer plugin + # install collectd-openstack-plugins # install puppet-barometer module # make directories for config files and mibs LIBGUESTFS_BACKEND=direct virt-customize \ - --run-command 'mkdir /opt/stack/collectd-ceilometer' \ - --run-command "tar xfz /opt/collectd-ceilometer-plugin.tar.gz -C /opt/stack/collectd-ceilometer" \ + --run-command 'mkdir /opt/stack/collectd-openstack' \ + --run-command "tar xfz /opt/collectd-openstack-plugins.tar.gz -C /opt/stack/collectd-openstack" \ --run-command "cd /etc/puppet/modules/ && mkdir barometer && \ tar xzf puppet-barometer.tar.gz -C barometer" \ --run-command 'mkdir /usr/share/mibs/' \ diff --git a/build/bash_completion_apex b/build/bash_completion_apex index b3c963e3..59c6afb6 100644 --- a/build/bash_completion_apex +++ b/build/bash_completion_apex @@ -50,7 +50,7 @@ __apex_complete () { } # run completion setup -__apex_complete ./deploy.sh __deploy_main +__apex_complete ./deploy.py __deploy_main __apex_complete opnfv-deploy __deploy_main __apex_complete ./util.sh __util_main __apex_complete opnfv-util __util_main diff --git a/build/build_ovs_nsh.sh b/build/build_ovs_nsh.sh index 52d4701f..2fba43f5 100755 --- a/build/build_ovs_nsh.sh +++ b/build/build_ovs_nsh.sh @@ -9,7 +9,10 @@ ############################################################################## set -e -yum -y install rpm-build autoconf automake libtool systemd-units openssl openssl-devel python python-twisted-core python-zope-interface python-six desktop-file-utils groff graphviz procps-ng libcap-ng libcap-ng-devel PyQt4 selinux-policy-devel kernel-devel kernel-headers kernel-tools +yum -y install rpm-build autoconf automake libtool systemd-units \ +openssl openssl-devel python python-twisted-core python-zope-interface \ +python-six desktop-file-utils groff graphviz procps-ng libcap-ng \ +libcap-ng-devel PyQt4 selinux-policy-devel ./boot.sh libtoolize --force aclocal @@ -19,7 +22,7 @@ autoconf ./configure yum -y install rpmdevtools # hack due to build pulling in kernel vxlan header -kernel_vxlan="/usr/src/kernels/$(rpm -q kernel-headers | grep -Eo '[0-9].*x86_64')/include/net/vxlan.h" +kernel_vxlan="/usr/src/kernels/$(rpm -q kernel | grep -Eo '[0-9].*x86_64')/include/net/vxlan.h" sed -i '/struct vxlan_metadata {/a\ u32 gpe;' $kernel_vxlan make rpm-fedora RPMBUILD_OPT="\"-D kversion `rpm -q kernel | rpmdev-sort | tail -n -1 | sed 's/^kernel-//'`\" --without check" make rpm-fedora-kmod RPMBUILD_OPT="\"-D kversion `rpm -q kernel | rpmdev-sort | tail -n -1 | sed 's/^kernel-//'`\"" diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index 0f3dd701..5b5d4500 100644 --- a/build/opnfv-environment.yaml +++ b/build/opnfv-environment.yaml @@ -3,7 +3,7 @@ # types parameters: - # # value updated via lib/overcloud-deploy-functions.sh + # value updated via lib/overcloud-deploy-functions.sh # CloudDomain: parameter_defaults: @@ -11,7 +11,7 @@ parameter_defaults: NeutronEnableForceMetadata: true NeutronEnableDHCPMetadata: true NeutronEnableIsolatedMetadata: true - #NeutronDhcpAgentsPerNetwork: 3 + # NeutronDhcpAgentsPerNetwork: 3 NeutronPluginExtensions: 'qos,port_security,data_plane_status' # TODO: VLAN Ranges should be configurable from network settings NeutronNetworkVLANRanges: 'datacentre:500:525' @@ -120,12 +120,12 @@ parameter_defaults: - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::OpenDaylightApi - OS::TripleO::Services::OpenDaylightOvs -# - OS::TripleO::Services::ONOSApi -# - OS::TripleO::Services::ONOSOvs + # - OS::TripleO::Services::ONOSApi + # - OS::TripleO::Services::ONOSOvs - OS::TripleO::Services::SensuClient - OS::TripleO::Services::FluentdClient - OS::TripleO::Services::Etcd -# - OS::TripleO::Services::Gluon + # - OS::TripleO::Services::Gluon - OS::TripleO::Services::Tacker - OS::TripleO::Services::NeutronHoneycombAgent - OS::TripleO::Services::Congress @@ -153,7 +153,7 @@ parameter_defaults: - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::NeutronSriovAgent - OS::TripleO::Services::OpenDaylightOvs -# - OS::TripleO::Services::ONOSOvs + # - OS::TripleO::Services::ONOSOvs - OS::TripleO::Services::SensuClient - OS::TripleO::Services::FluentdClient - OS::TripleO::Services::NeutronHoneycombAgent diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 8efe8225..6fdc32d6 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -42,7 +42,7 @@ git clone https://gerrit.opnfv.org/gerrit/vswitchperf vsperf tar czf vsperf.tar.gz vsperf # Increase disk size by 1200MB to accommodate more packages -qemu-img resize overcloud-full_build.qcow2 +1200MB +qemu-img resize overcloud-full_build.qcow2 +1200M # expand file system to max disk size # installing forked apex-puppet-tripleo @@ -170,6 +170,10 @@ LIBGUESTFS_BACKEND=direct virt-customize \ LIBGUESTFS_BACKEND=direct virt-customize \ + --upload ${BUILD_ROOT}/CentOS-Updates.repo:/etc/yum.repos.d/ \ + --run-command "yum -y install kernel-devel-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \ + --run-command "yum -y install kernel-headers-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \ + --run-command "yum -y install kernel-tools-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \ --upload ${BUILD_ROOT}/build_ovs_nsh.sh:/root/ \ --upload ovs.tar.gz:/root/ \ --run-command "cd /root/ && tar xzf ovs.tar.gz" \ diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 96b43d87..c850005e 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -42,6 +42,8 @@ pushd puppet-opendaylight > /dev/null git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-carbon.tar.gz git checkout master git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-master.tar.gz +git checkout stable/nitrogen +git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-nitrogen.tar.gz popd > /dev/null # cache gluon @@ -71,6 +73,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_DIR}/puppet-opendaylight-carbon.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight-carbon.tar.gz" \ --upload ${BUILD_DIR}/puppet-opendaylight-master.tar.gz:/root/ \ + --upload ${BUILD_DIR}/puppet-opendaylight-nitrogen.tar.gz:/root/ \ --upload ${BUILD_DIR}/puppet-gluon.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-gluon.tar.gz" \ --install python-click \ diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec index 37e32145..c2e2f14e 100644 --- a/build/rpm_specs/opnfv-apex-common.spec +++ b/build/rpm_specs/opnfv-apex-common.spec @@ -35,7 +35,6 @@ rst2html docs/release/release-notes/release-notes.rst docs/release/release-notes %install mkdir -p %{buildroot}%{_bindir}/ %py3_install -install ci/clean.sh %{buildroot}%{_bindir}/opnfv-clean install ci/util.sh %{buildroot}%{_bindir}/opnfv-util mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/ @@ -113,6 +112,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Fri Sep 08 2017 Tim Rozet <trozet@redhat.com> - 5.0-6 +- Updates clean to use python * 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 diff --git a/build/undercloud.sh b/build/undercloud.sh index 3244e7f3..05cbf552 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -38,6 +38,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install "openstack-utils" \ --install "ceph-common" \ --install "python2-networking-sfc" \ + --install openstack-ironic-inspector,subunit-filters,docker-distribution,openstack-tripleo-validations \ --run-command "cd /usr/share && rm -rf openstack-tripleo-heat-templates && tar xzf apex-tripleo-heat-templates.tar.gz" \ --run-command "sed -i '/ControllerEnableCephStorage/c\\ ControllerEnableCephStorage: true' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" \ --run-command "sed -i '/ComputeEnableCephStorage/c\\ ComputeEnableCephStorage: true' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" \ @@ -50,6 +51,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_ROOT}/csit-environment.yaml:/home/stack/ \ --upload ${BUILD_ROOT}/virtual-environment.yaml:/home/stack/ \ --upload ${BUILD_ROOT}/baremetal-environment.yaml:/home/stack/ \ + --uninstall "libvirt-client" \ --install "libguestfs-tools" \ -a undercloud_build.qcow2 |