diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 2 | ||||
| -rwxr-xr-x | build/build_quagga.sh | 2 | ||||
| -rw-r--r-- | build/enable_rt_kvm.yaml | 4 | ||||
| -rw-r--r-- | build/first-boot.yaml | 63 | ||||
| -rw-r--r-- | build/opnfv-environment.yaml | 37 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 35 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 16 | ||||
| -rw-r--r-- | build/patches/puppet-neutron-add-external_network_bridge-option.patch | 106 | ||||
| -rw-r--r-- | build/rpm_specs/networking-vpp.spec | 2 | ||||
| -rw-r--r-- | build/rpm_specs/opnfv-apex-common.spec | 7 | ||||
| -rwxr-xr-x | build/undercloud.sh | 13 | ||||
| -rw-r--r-- | build/variables.sh | 21 |
12 files changed, 243 insertions, 65 deletions
diff --git a/build/Makefile b/build/Makefile index f1fde6a3..23b7f115 100644 --- a/build/Makefile +++ b/build/Makefile @@ -132,7 +132,7 @@ rpmlint: $(BUILD_DIR)/python-networking-vpp.tar.gz: @echo "Preparing the networking-vpp RPM prerequisites" - git clone $(NETVPP_REPO) $(BUILD_DIR)/python-networking-vpp-$(NETVPP_VERS) + git clone $(NETVPP_REPO) -b $(NETVPP_BRANCH) $(BUILD_DIR)/python-networking-vpp-$(NETVPP_VERS) tar czf $(BUILD_DIR)/python-networking-vpp.tar.gz -C $(BUILD_DIR) python-networking-vpp-$(NETVPP_VERS) .PHONY: networking-vpp-rpm diff --git a/build/build_quagga.sh b/build/build_quagga.sh index a682b54e..e33cd274 100755 --- a/build/build_quagga.sh +++ b/build/build_quagga.sh @@ -170,7 +170,7 @@ build_zrpc(){ # ZRPC RPM ./configure --enable-zrpcd \ --enable-user=quagga --enable-group=quagga \ - --enable-vty-group=quagga + --enable-vty-group=quagga --with-thrift-version=4 make dist cat > $rpmbuild/SOURCES/zrpcd.service <<EOF diff --git a/build/enable_rt_kvm.yaml b/build/enable_rt_kvm.yaml index 4601fd40..35a00d7d 100644 --- a/build/enable_rt_kvm.yaml +++ b/build/enable_rt_kvm.yaml @@ -1,5 +1,3 @@ --- parameter_defaults: - ComputeKernelArgs: 'kvmfornfv_kernel.rpm' -resource_registry: - OS::TripleO::NodeUserData: kvm4nfv-1st-boot.yaml + KVMForNFVKernelRPM: 'kvmfornfv_kernel.rpm' diff --git a/build/first-boot.yaml b/build/first-boot.yaml index 1e8921ba..582981c0 100644 --- a/build/first-boot.yaml +++ b/build/first-boot.yaml @@ -16,6 +16,15 @@ parameters: "intel_iommu=on default_hugepagesz=2MB hugepagesz=2MB hugepages=2048" type: string default: "" + KVMForNFVKernelRPM: + description: > + Name of the kvmfornfv kernel rpm. + Example: "kvmfornfv_kernel.rpm" + type: string + default: "" + ComputeHostnameFormat: + type: string + default: "" resources: userdata: @@ -33,23 +42,51 @@ resources: template: | #!/bin/bash set -x - sed 's/^\(GRUB_CMDLINE_LINUX=".*\)"/\1 $KERNEL_ARGS"/g' \ - -i /etc/default/grub ; - grub2-mkconfig -o /etc/grub2.cfg - hugepage_count=$(echo $KERNEL_ARGS | \ - grep -oP ' ?hugepages=\K[0-9]+') - if [ -z "$hugepage_count" ]; then - hugepage_count=1024 + need_reboot='false' + + if [ -n "$KERNEL_ARGS" ]; then + sed 's/^\(GRUB_CMDLINE_LINUX=".*\)"/\1 $KERNEL_ARGS"/g' \ + -i /etc/default/grub ; + grub2-mkconfig -o /etc/grub2.cfg + hugepage_count=$(echo $KERNEL_ARGS | \ + grep -oP ' ?hugepages=\K[0-9]+') + if [ -z "$hugepage_count" ]; then + hugepage_count=1024 + fi + echo vm.hugetlb_shm_group=0 >> /usr/lib/sysctl.d/00-system.conf + HPAGE_CT=$(printf "%.0f" $(echo 2.2*$hugepage_count | bc)) + echo vm.max_map_count=$HPAGE_CT >> \ + /usr/lib/sysctl.d/00-system.conf + HPAGE_CT=$(($hugepage_count * 2 * 1024 * 1024)) + echo kernel.shmmax=$HPAGE_CT >> /usr/lib/sysctl.d/00-system.conf + need_reboot='true' + fi + + if [ -n "$KVMFORNFV_KERNEL_RPM" ]; then + FORMAT=$COMPUTE_HOSTNAME_FORMAT + if [[ -z $FORMAT ]] ; then + FORMAT="compute" ; + else + # Assumption: only %index% and %stackname% are + # the variables in Host name format + FORMAT=$(echo $FORMAT | sed 's/\%index\%//g'); + FORMAT=$(echo $FORMAT | sed 's/\%stackname\%//g'); + fi + if [[ $(hostname) == *$FORMAT* ]] ; then + yum install -y /root/$KVMFORNFV_KERNEL_RPM + grub2-mkconfig -o /etc/grub2.cfg + sleep 5 + need_reboot='true' + fi fi - echo vm.hugetlb_shm_group=0 >> /usr/lib/sysctl.d/00-system.conf - HPAGE_CT=$(printf "%.0f" $(echo 2.2*$hugepage_count | bc)) - echo vm.max_map_count=$HPAGE_CT >> /usr/lib/sysctl.d/00-system.conf - HPAGE_CT=$(($hugepage_count * 2 * 1024 * 1024)) - echo kernel.shmmax=$HPAGE_CT >> /usr/lib/sysctl.d/00-system.conf - reboot + if [ "$need_reboot" == "true" ]; then + reboot + fi params: $KERNEL_ARGS: {get_param: ComputeKernelArgs} + $KVMFORNFV_KERNEL_RPM: {get_param: KVMForNFVKernelRPM} + $COMPUTE_HOSTNAME_FORMAT: {get_param: ComputeHostnameFormat} outputs: OS::stack_id: diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index 7da252ec..9d049028 100644 --- a/build/opnfv-environment.yaml +++ b/build/opnfv-environment.yaml @@ -12,7 +12,8 @@ parameter_defaults: NeutronEnableDHCPMetadata: true NeutronEnableIsolatedMetadata: true # NeutronDhcpAgentsPerNetwork: 3 - NeutronPluginExtensions: 'qos,port_security,data_plane_status' + NeutronPluginExtensions: 'qos,port_security,neutron.plugins.ml2.extensions.\ + data_plane_status:DataPlaneStatusExtensionDriver' # TODO: VLAN Ranges should be configurable from network settings NeutronNetworkVLANRanges: 'datacentre:500:525' # NeutronVPPAgentPhysnets: @@ -26,14 +27,32 @@ parameter_defaults: # NeutronDpdkMemoryChannels: # ControllerExtraConfig: # NovaComputeExtraConfig: + MigrationSshKey: + public_key: replace_public_key + private_key: replace_private_key + SshServerOptions: + HostKey: + - '/etc/ssh/ssh_host_rsa_key' + - '/etc/ssh/ssh_host_ecdsa_key' + - '/etc/ssh/ssh_host_ed25519_key' + SyslogFacility: 'AUTHPRIV' + AuthorizedKeysFile: '.ssh/authorized_keys' + PasswordAuthentication: 'no' + ChallengeResponseAuthentication: 'no' + GSSAPIAuthentication: 'no' + GSSAPICleanupCredentials: 'no' + UsePAM: 'yes' + X11Forwarding: 'yes' + UsePrivilegeSeparation: 'sandbox' + AcceptEnv: + - 'LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES' + - 'LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT' + - 'LC_IDENTIFICATION LC_ALL LANGUAGE' + - 'XMODIFIERS' + Subsystem: 'sftp /usr/libexec/openssh/sftp-server' + UseDNS: 'no' ExtraConfig: tripleo::ringbuilder::build_ring: false - nova::nova_public_key: - type: 'ssh-rsa' - replace_public_key: - nova::nova_private_key: - type: 'ssh-rsa' - replace_private_key: nova::policy::policies: nova-os_compute_api:servers:show:host_status: key: 'os_compute_api:servers:show:host_status' @@ -50,6 +69,7 @@ parameter_defaults: # value updated via lib/overcloud-deploy-functions.sh # opendaylight::vpp_routing_node: overcloud-novacompute-0.opnfvlf.org ControllerServices: + - OS::TripleO::Services::Sshd - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephMon - OS::TripleO::Services::CephOSD @@ -132,8 +152,9 @@ parameter_defaults: - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::Vpp - - OS::TripleO::Services::NeutronBgpvpnApi + - OS::TripleO::Services::NeutronBgpVpnApi ComputeServices: + - OS::TripleO::Services::Sshd - OS::TripleO::Services::Barometer - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index af582f17..06adbbe6 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -41,8 +41,8 @@ rm -rf vsperf vsperf.tar.gz 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 +1200M +# Increase disk size by 1500MB to accommodate more packages +qemu-img resize overcloud-full_build.qcow2 +1500M # expand file system to max disk size # installing forked apex-puppet-tripleo @@ -56,9 +56,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "cd /usr/lib/python2.7/site-packages/ && rm -rf os_net_config && tar xzf apex-os-net-config.tar.gz" \ --run-command "if ! rpm -qa | grep python-redis; then yum install -y python-redis; fi" \ --install epel-release \ - --run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \ - --run-command "sed -i 's/^GSSAPIAuthentication.*$/GSSAPIAuthentication no/' /etc/ssh/sshd_config" \ - --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \ --install unzip \ --upload ${BUILD_DIR}/vsperf.tar.gz:/var/opt \ --run-command "cd /var/opt && tar xzf vsperf.tar.gz" \ @@ -76,6 +73,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-vpp-ml2-type_drivers-setting.patch" \ --upload ${BUILD_ROOT}/patches/tacker-vnffg-input-params.patch:/usr/lib/python2.7/site-packages/ \ --run-command "cd usr/lib/python2.7/site-packages/ && patch -p1 < tacker-vnffg-input-params.patch" \ + --upload ${BUILD_ROOT}/patches/puppet-neutron-add-external_network_bridge-option.patch:/usr/share/openstack-puppet/modules/neutron/ \ + --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-add-external_network_bridge-option.patch" \ -a overcloud-full_build.qcow2 # apply neutron port data plane status patches @@ -104,8 +103,6 @@ done rm -rf puppet-fdio git clone https://git.fd.io/puppet-fdio pushd puppet-fdio > /dev/null -#TODO: Remove this when we update to 17.07 -git revert a6e575c8f0af17e62990653bcf4a12c688c21aad --no-edit git archive --format=tar.gz --prefix=fdio/ HEAD > ${BUILD_DIR}/puppet-fdio.tar.gz popd > /dev/null @@ -118,6 +115,12 @@ enabled=1 gpgcheck=0 EOF +vpp_nosdn_pkg_str='' +for package in ${nosdn_vpp_rpms[@]}; do + wget $package + vpp_nosdn_pkg_str+=" --upload ${BUILD_DIR}/${package##*/}:/root/nosdn_vpp_rpms" +done + # Kubernetes Repo cat > ${BUILD_DIR}/kubernetes.repo << EOF [kubernetes] @@ -133,13 +136,6 @@ EOF # Get Real Time Kernel from kvm4nfv populate_cache $kvmfornfv_uri_base/$kvmfornfv_kernel_rpm -# packages frozen for fdio scenarios -fdio_pkg_str='' -for package in ${fdio_pkgs[@]}; do - wget "$package" - fdio_pkg_str+=" --upload ${BUILD_DIR}/${package##*/}:/root/fdio/" -done - # upload dpdk rpms but do not install # install fd.io yum repo and packages # upload puppet fdio @@ -151,16 +147,19 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_DIR}/puppet-fdio.tar.gz:/etc/puppet/modules \ --run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \ --upload ${BUILD_DIR}/fdio.repo:/etc/yum.repos.d/ \ + --run-command "mkdir /root/nosdn_vpp_rpms" \ + $vpp_nosdn_pkg_str \ --upload ${BUILD_DIR}/kubernetes.repo:/etc/yum.repos.d/ \ --run-command "mkdir /root/fdio" \ - --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio \ - $fdio_pkg_str \ - --run-command "yum install -y /root/fdio/*.rpm" \ + --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/nosdn_vpp_rpms \ + --install honeycomb \ + --install vpp-plugins,vpp,vpp-lib,vpp-api-python \ + --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \ --run-command "curl -f https://copr.fedorainfracloud.org/coprs/leifmadsen/ovs-master/repo/epel-7/leifmadsen-ovs-master-epel-7.repo > /etc/yum.repos.d/leifmadsen-ovs-master-epel-7.repo" \ --run-command "mkdir /root/ovs28" \ --run-command "yumdownloader --destdir=/root/ovs28 openvswitch*2.8* python-openvswitch-2.8*" \ --upload ${CACHE_DIR}/$kvmfornfv_kernel_rpm:/root/ \ - --install python2-networking-sfc \ + --install "http://mirror.centos.org/centos/7/cloud/x86_64/openstack-ocata/python2-networking-sfc-4.0.0-1.el7.noarch.rpm" \ --install python-etcd,puppet-etcd \ --install patch \ --install docker,kubelet,kubeadm,kubectl,kubernetes-cni \ diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index c850005e..22a539af 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -35,6 +35,14 @@ enabled=1 gpgcheck=0 EOF +cat > ${BUILD_DIR}/opendaylight_master.repo << EOF +[opendaylight-master] +name=OpenDaylight master repository +baseurl=https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-x86_64-devel/ +enabled=1 +gpgcheck=0 +EOF + # OpenDaylight Puppet Module rm -rf puppet-opendaylight git clone -b stable/carbon https://git.opendaylight.org/gerrit/integration/packaging/puppet-opendaylight @@ -61,10 +69,12 @@ populate_cache http://artifacts.opnfv.org/apex/danube/fdio_netvirt/opendaylight- # install ODL packages # Patch in OPNFV custom puppet-tripleO -# install Honeycomb # install quagga/zrpc # upload neutron patch for generic NS linux interface driver + OVS for external networks LIBGUESTFS_BACKEND=direct virt-customize \ + --upload ${BUILD_DIR}/opendaylight_master.repo:/etc/yum.repos.d/opendaylight.repo \ + --run-command "mkdir -p /root/master" \ + --run-command "yumdownloader --destdir=/root/master opendaylight" \ --upload ${BUILD_DIR}/opendaylight_nitrogen.repo:/etc/yum.repos.d/opendaylight.repo \ --run-command "mkdir -p /root/nitrogen" \ --run-command "yum install --downloadonly --downloaddir=/root/nitrogen opendaylight" \ @@ -90,12 +100,8 @@ if [ "$(uname -i)" == 'x86_64' ]; then # Download quagga/zrpc rpms populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga-3.tar.gz -# Download Honeycomb -populate_cache $honeycomb_pkg LIBGUESTFS_BACKEND=direct virt-customize \ - --upload ${CACHE_DIR}/${honeycomb_pkg##*/}:/root/fdio/ \ - --run-command "yum install -y /root/fdio/${honeycomb_pkg##*/}" \ --install zeromq-4.1.4 \ --upload ${CACHE_DIR}/quagga-3.tar.gz:/root/ \ --run-command "cd /root/ && tar xzf quagga-3.tar.gz" \ diff --git a/build/patches/puppet-neutron-add-external_network_bridge-option.patch b/build/patches/puppet-neutron-add-external_network_bridge-option.patch new file mode 100644 index 00000000..808bcae0 --- /dev/null +++ b/build/patches/puppet-neutron-add-external_network_bridge-option.patch @@ -0,0 +1,106 @@ +From 48a73ebfd382158b900c041952689128390d14f3 Mon Sep 17 00:00:00 2001 +From: Feng Pan <fpan@redhat.com> +Date: Sat, 30 Sep 2017 01:02:27 -0400 +Subject: [PATCH] Add external_network_bridge config back + +Change-Id: I67582e2033eb1f849f7e76148f089a7f815d1f78 +--- + manifests/agents/l3.pp | 13 +++++++++++++ + manifests/agents/vpnaas.pp | 14 ++++++++++++++ + ...d_external_network_bridge-options-613a8793ef13d761.yaml | 3 --- + 3 files changed, 27 insertions(+), 3 deletions(-) + delete mode 100644 releasenotes/notes/remove_deprecated_external_network_bridge-options-613a8793ef13d761.yaml + +diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp +index 651c7508..df25e3e3 100644 +--- a/manifests/agents/l3.pp ++++ b/manifests/agents/l3.pp +@@ -92,6 +92,12 @@ + # (optional) L3 agent extensions to enable. + # Defaults to $::os_service_default + # ++# === Deprecated Parameters ++# ++# [*external_network_bridge*] ++# (optional) Deprecated. The name of the external bridge ++# Defaults to $::os_service_default ++# + class neutron::agents::l3 ( + $package_ensure = 'present', + $enabled = true, +@@ -113,11 +119,17 @@ class neutron::agents::l3 ( + $purge_config = false, + $availability_zone = $::os_service_default, + $extensions = $::os_service_default, ++ # DEPRECATED PARAMETERS ++ $external_network_bridge = $::os_service_default, + ) { + + include ::neutron::deps + include ::neutron::params + ++ if ! is_service_default ($external_network_bridge) { ++ warning('parameter external_network_bridge is deprecated') ++ } ++ + resources { 'neutron_l3_agent_config': + purge => $purge_config, + } +@@ -132,6 +144,7 @@ class neutron::agents::l3 ( + + neutron_l3_agent_config { + 'DEFAULT/debug': value => $debug; ++ 'DEFAULT/external_network_bridge': value => $external_network_bridge; + 'DEFAULT/interface_driver': value => $interface_driver; + 'DEFAULT/gateway_external_network_id': value => $gateway_external_network_id; + 'DEFAULT/handle_internal_only_routers': value => $handle_internal_only_routers; +diff --git a/manifests/agents/vpnaas.pp b/manifests/agents/vpnaas.pp +index 52eb4026..1bab10e7 100644 +--- a/manifests/agents/vpnaas.pp ++++ b/manifests/agents/vpnaas.pp +@@ -45,12 +45,18 @@ + # in the vpnaas config. + # Defaults to false. + # ++# === Deprecated Parameters ++# ++# [*external_network_bridge*] ++# (optional) Deprecated. Defaults to $::os_service_default ++# + class neutron::agents::vpnaas ( + $package_ensure = present, + $enabled = true, + $manage_service = true, + $vpn_device_driver = 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver', + $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', ++ $external_network_bridge = $::os_service_default, + $ipsec_status_check_interval = $::os_service_default, + $purge_config = false, + ) { +@@ -97,6 +103,14 @@ class neutron::agents::vpnaas ( + 'DEFAULT/interface_driver': value => $interface_driver; + } + ++ if ! is_service_default ($external_network_bridge) { ++ warning('parameter external_network_bridge is deprecated') ++ } ++ ++ neutron_vpnaas_agent_config { ++ 'DEFAULT/external_network_bridge': value => $external_network_bridge; ++ } ++ + if $::neutron::params::vpnaas_agent_package { + ensure_resource( 'package', 'neutron-vpnaas-agent', { + 'ensure' => $package_ensure, +diff --git a/releasenotes/notes/remove_deprecated_external_network_bridge-options-613a8793ef13d761.yaml b/releasenotes/notes/remove_deprecated_external_network_bridge-options-613a8793ef13d761.yaml +deleted file mode 100644 +index 10464012..00000000 +--- a/releasenotes/notes/remove_deprecated_external_network_bridge-options-613a8793ef13d761.yaml ++++ /dev/null +@@ -1,3 +0,0 @@ +---- +-deprecations: +- - Removed deprecated option external_network_bridge. +-- +2.13.4 + diff --git a/build/rpm_specs/networking-vpp.spec b/build/rpm_specs/networking-vpp.spec index 4211f94a..80687836 100644 --- a/build/rpm_specs/networking-vpp.spec +++ b/build/rpm_specs/networking-vpp.spec @@ -2,7 +2,7 @@ Summary: OpenStack Networking for VPP Name: python-networking-vpp -Version: 0.0.1 +Version: 17.07 Release: %{release}%{?git}%{?dist} License: Apache 2.0 diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec index c2e2f14e..51094a93 100644 --- a/build/rpm_specs/opnfv-apex-common.spec +++ b/build/rpm_specs/opnfv-apex-common.spec @@ -69,6 +69,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-bar-noha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-bar-ha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-calipso-noha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-fdio-noha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-fdio-ha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-noha.yaml @@ -86,8 +87,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/os-odl-fdio-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl_netvirt-fdio-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl-fdio-ha.yaml -%{_sysconfdir}/opnfv-apex/os-odl-fdio-dvr-ha.yaml -%{_sysconfdir}/opnfv-apex/os-odl-fdio-dvr-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-fdio_dvr-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-fdio_dvr-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl-nofeature-ha.yaml @@ -112,6 +113,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Wed Sep 20 2017 Tim Rozet <trozet@redhat.com> - 5.0-7 +- Add calipso * 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 diff --git a/build/undercloud.sh b/build/undercloud.sh index bd494fb4..baaf424e 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -26,6 +26,9 @@ popd > /dev/null # inject rt_kvm kernel rpm name into the enable file sed "s/kvmfornfv_kernel.rpm/$kvmfornfv_kernel_rpm/" ${BUILD_ROOT}/enable_rt_kvm.yaml | tee ${BUILD_DIR}/enable_rt_kvm.yaml +# grab latest calipso +populate_cache $calipso_uri_base/$calipso_script + # Turn off GSSAPI Auth in sshd # installing forked apex-tht # enabling ceph OSDs to live on the controller @@ -37,7 +40,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_DIR}/apex-tripleo-heat-templates.tar.gz:/usr/share \ --install "openstack-utils" \ --install "ceph-common" \ - --install "python2-networking-sfc" \ + --install "http://mirror.centos.org/centos/7/cloud/x86_64/openstack-ocata/python2-networking-sfc-4.0.0-1.el7.noarch.rpm" \ + --install epel-release \ + --install python34,python34-pip \ --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" \ @@ -45,17 +50,19 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "cp /usr/share/instack-undercloud/undercloud.conf.sample /home/stack/undercloud.conf && chown stack:stack /home/stack/undercloud.conf" \ --upload ${BUILD_ROOT}/opnfv-environment.yaml:/home/stack/ \ --upload ${BUILD_ROOT}/first-boot.yaml:/home/stack/ \ - --upload ${BUILD_ROOT}/kvm4nfv-1st-boot.yaml:/home/stack/ \ - --upload ${BUILD_DIR}/enable_rt_kvm.yaml:/home/stack/ \ + --upload ${BUILD_DIR}/enable_rt_kvm.yaml:/usr/share/openstack-tripleo-heat-templates/environments/ \ --upload ${BUILD_ROOT}/ovs-dpdk-preconfig.yaml:/home/stack/ \ --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" \ + --upload ${CACHE_DIR}/${calipso_script}:/root/ \ --install "libguestfs-tools" \ --install "python-tackerclient" \ --upload ${BUILD_ROOT}/patches/tacker-client-fix-symmetrical.patch:/usr/lib/python2.7/site-packages/ \ --run-command "cd usr/lib/python2.7/site-packages/ && patch -p1 < tacker-client-fix-symmetrical.patch" \ + --run-command "yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo" \ + --install yum-utils,lvm2,device-mapper-persistent-data \ -a undercloud_build.qcow2 mv -f undercloud_build.qcow2 undercloud.qcow2 diff --git a/build/variables.sh b/build/variables.sh index 8d736d30..b0713268 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -38,18 +38,19 @@ dpdk_rpms=( kvmfornfv_uri_base="http://artifacts.opnfv.org/kvmfornfv/danube" kvmfornfv_kernel_rpm="kvmfornfv-4bfeded9-apex-kernel-4.4.50_rt62_centos.x86_64.rpm" +calipso_uri_base="https://git.opnfv.org/calipso/plain/app/install" +calipso_script="calipso-installer.py" + netvpp_repo="https://github.com/openstack/networking-vpp" -netvpp_branch="master" +netvpp_branch="17.07" netvpp_commit=$(git ls-remote ${netvpp_repo} ${netvpp_branch} | awk '{print substr($1,1,7)}') -netvpp_pkg=python-networking-vpp-0.0.1-1.git${NETVPP_COMMIT}$(rpm -E %dist).noarch.rpm +netvpp_pkg=python-networking-vpp-17.07-1.git${NETVPP_COMMIT}$(rpm -E %dist).noarch.rpm gluon_rpm=gluon-0.0.1-1_20170302.noarch.rpm -fdio_pkgs=( -'http://artifacts.opnfv.org/apex/danube/fdio_common_rpms/vpp-17.04.1-3~ge3b7ad7~b72.x86_64.rpm' -'http://artifacts.opnfv.org/apex/danube/fdio_common_rpms/vpp-api-python-17.04.1-3~ge3b7ad7~b72.x86_64.rpm' -'http://artifacts.opnfv.org/apex/danube/fdio_common_rpms/vpp-lib-17.04.1-3~ge3b7ad7~b72.x86_64.rpm' -'http://artifacts.opnfv.org/apex/danube/fdio_common_rpms/vpp-plugins-17.04.1-3~ge3b7ad7~b72.x86_64.rpm' -) - -honeycomb_pkg='http://artifacts.opnfv.org/apex/danube/fdio_common_rpms/honeycomb-1.17.04.1-2073.noarch.rpm' +nosdn_vpp_rpms=( +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp/17.07.01-release.x86_64/vpp-17.07.01-release.x86_64.rpm' +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-api-python/17.07.01-release.x86_64/vpp-api-python-17.07.01-release.x86_64.rpm' +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-lib/17.07.01-release.x86_64/vpp-lib-17.07.01-release.x86_64.rpm' +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-plugins/17.07.01-release.x86_64/vpp-plugins-17.07.01-release.x86_64.rpm' +)
\ No newline at end of file |