From df388a8afedc29f9cfebdab3cc39ef27f93d9612 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 28 Sep 2018 16:01:13 -0400 Subject: Migrates from queens to rocky For now we need to retain the ability to deploy odl-queens for CSIT. Change-Id: Idea550ff5e7aeb230aa93d3575de11e5e9656302 Signed-off-by: Tim Rozet --- build/csit-rocky-environment.yaml | 93 +++++++++++++++++++++++++++++++++++++++ build/rpm_specs/opnfv-apex.spec | 24 +++++----- 2 files changed, 106 insertions(+), 11 deletions(-) create mode 100644 build/csit-rocky-environment.yaml (limited to 'build') diff --git a/build/csit-rocky-environment.yaml b/build/csit-rocky-environment.yaml new file mode 100644 index 00000000..048833d1 --- /dev/null +++ b/build/csit-rocky-environment.yaml @@ -0,0 +1,93 @@ +--- +# Environment file used to list common parameters required for all deployment +# types + +parameters: + CloudDomain: opnfvlf.org + +parameter_defaults: + GlanceBackend: file + CeilometerStoreEvents: true + NeutronEnableForceMetadata: true + NeutronEnableDHCPMetadata: true + NeutronEnableIsolatedMetadata: true + ExtraConfig: + tripleo::ringbuilder::build_ring: false + nova::api::default_floating_pool: 'external' + DockerPuppetProcessCount: 10 + NeutronNetworkVLANRanges: 'datacentre:500:525' + 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' + ControllerServices: + - OS::TripleO::Services::CACerts + - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::Kernel + - OS::TripleO::Services::Docker + - OS::TripleO::Services::Keystone + - OS::TripleO::Services::GlanceApi + - OS::TripleO::Services::GlanceRegistry + - OS::TripleO::Services::MySQL + - OS::TripleO::Services::MySQLClient + - OS::TripleO::Services::NeutronDhcpAgent + - OS::TripleO::Services::NeutronMetadataAgent + - OS::TripleO::Services::NeutronApi + - OS::TripleO::Services::NeutronCorePlugin + - OS::TripleO::Services::HAproxy + - OS::TripleO::Services::Keepalived + - OS::TripleO::Services::Memcached + - OS::TripleO::Services::Redis + - OS::TripleO::Services::NovaConductor + - OS::TripleO::Services::MongoDb + - OS::TripleO::Services::NovaApi + - OS::TripleO::Services::NovaMetadata + - OS::TripleO::Services::NovaScheduler + - OS::TripleO::Services::NovaConsoleauth + - OS::TripleO::Services::NovaPlacement + - OS::TripleO::Services::NovaVncProxy + - OS::TripleO::Services::Ntp + - OS::TripleO::Services::OsloMessagingRpc + - OS::TripleO::Services::OsloMessagingNotify + - OS::TripleO::Services::Pacemaker + - OS::TripleO::Services::Snmp + - OS::TripleO::Services::Sshd + - OS::TripleO::Services::Timezone + - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::TripleoFirewall + - OS::TripleO::Services::OpenDaylightApi + - OS::TripleO::Services::OpenDaylightOvs + ComputeServices: + - OS::TripleO::Services::CACerts + - OS::TripleO::Services::Timezone + - OS::TripleO::Services::Ntp + - OS::TripleO::Services::Snmp + - OS::TripleO::Services::Sshd + - OS::TripleO::Services::MySQLClient + - OS::TripleO::Services::NovaCompute + - OS::TripleO::Services::NovaLibvirt + - OS::TripleO::Services::Kernel + - OS::TripleO::Services::Docker + - OS::TripleO::Services::ComputeNeutronCorePlugin + - OS::TripleO::Services::ComputeNeutronMetadataAgent + - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::TripleoFirewall + - OS::TripleO::Services::NeutronSriovAgent + - OS::TripleO::Services::OpenDaylightOvs diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec index 09da36a4..d05397ed 100644 --- a/build/rpm_specs/opnfv-apex.spec +++ b/build/rpm_specs/opnfv-apex.spec @@ -1,7 +1,7 @@ %global srcname opnfv-apex Name: python34-%{srcname} -Version: 7.0 +Version: 8.0 Release: %{_release} Summary: Scripts for OPNFV deployment using Apex @@ -72,16 +72,18 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_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-calipso_queens-noha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-calipso_rocky-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 %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml -%{_sysconfdir}/opnfv-apex/os-nosdn-queens-noha.yaml -%{_sysconfdir}/opnfv-apex/os-nosdn-queens-ha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-rocky-noha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-rocky-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl-queens-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl-queens-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-rocky-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-rocky-ha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-ha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-kvm-ha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-kvm-noha.yaml @@ -89,12 +91,12 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/os-nosdn-kvm_ovs_dpdk-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-noha.yaml -%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn_queens-ha.yaml -%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn_queens-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn_rocky-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn_rocky-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl-sfc-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl-sfc-noha.yaml -%{_sysconfdir}/opnfv-apex/os-odl-sfc_queens-ha.yaml -%{_sysconfdir}/opnfv-apex/os-odl-sfc_queens-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-sfc_rocky-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-sfc_rocky-noha.yaml %{_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 @@ -110,7 +112,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/os-odl-sriov-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl-gluon-noha.yaml %{_sysconfdir}/opnfv-apex/os-ovn-nofeature-ha.yaml -%{_sysconfdir}/opnfv-apex/os-ovn-queens-ha.yaml +%{_sysconfdir}/opnfv-apex/os-ovn-rocky-ha.yaml %{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml %{_sysconfdir}/opnfv-apex/os-ocl-nofeature-ha.yaml @@ -130,8 +132,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog -* Thu Sep 27 2018 Tim Rozet - 7.0-8 - Adds OVN HA and Queens scenario +* Thu Sep 27 2018 Tim Rozet - 8.0-0 + Updates from Queens to Rocky * Fri Aug 24 2018 Tim Rozet - 7.0-7 Add Calipso for Queens * Tue Aug 21 2018 Ricardo Noriega - 7.0-6 -- cgit 1.2.3-korg