From: Tim Rozet Date: Fri, 28 Sep 2018 20:01:13 +0000 (-0400) Subject: Migrates from queens to rocky X-Git-Tag: opnfv-8.0.0~36 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=df388a8afedc29f9cfebdab3cc39ef27f93d9612;p=apex.git 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 --- diff --git a/apex/common/constants.py b/apex/common/constants.py index c3e3f5a0..5a2b7f98 100644 --- a/apex/common/constants.py +++ b/apex/common/constants.py @@ -39,10 +39,7 @@ VIRT_PW = '--root-password' THT_DIR = '/usr/share/openstack-tripleo-heat-templates' THT_ENV_DIR = os.path.join(THT_DIR, 'environments') -THT_DOCKER_ENV_DIR = { - 'master': os.path.join(THT_ENV_DIR, 'services'), - 'queens': os.path.join(THT_ENV_DIR, 'services') -} +THT_DOCKER_ENV_DIR = os.path.join(THT_ENV_DIR, 'services') DEFAULT_OS_VERSION = 'master' DEFAULT_ODL_VERSION = 'oxygen' diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py index 6e1d5bb4..4deeabff 100644 --- a/apex/overcloud/deploy.py +++ b/apex/overcloud/deploy.py @@ -152,7 +152,7 @@ def get_docker_sdn_files(ds_opts): :return: list of docker THT env files for an SDN """ docker_services = con.VALID_DOCKER_SERVICES - tht_dir = con.THT_DOCKER_ENV_DIR[ds_opts['os_version']] + tht_dir = con.THT_DOCKER_ENV_DIR sdn_env_list = build_sdn_env_list(ds_opts, SDN_FILE_MAP) for i, sdn_file in enumerate(sdn_env_list): sdn_base = os.path.basename(sdn_file) 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 diff --git a/config/deploy/common-patches.yaml b/config/deploy/common-patches.yaml index ac006bdd..d408a161 100644 --- a/config/deploy/common-patches.yaml +++ b/config/deploy/common-patches.yaml @@ -11,6 +11,21 @@ patches: project: openstack/puppet-tripleo - change-id: I93e3d355625508fdc42f44bdd358f3ba86fbd8d7 project: openstack/puppet-tripleo + rocky: + undercloud: + - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36 + project: openstack/tripleo-common + branch: master + - change-id: Iaa2276aadae351fbc138de258c51d786f69e4395 + project: openstack/tripleo-common + branch: master + overcloud: + - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310 + project: openstack/puppet-tripleo + branch: master + - change-id: I93e3d355625508fdc42f44bdd358f3ba86fbd8d7 + project: openstack/puppet-tripleo + branch: master queens: undercloud: - change-id: I966bf7f6f8d1cbc656abfad59e8bb927e1aa53c2 diff --git a/config/deploy/os-nosdn-calipso_queens-noha.yaml b/config/deploy/os-nosdn-calipso_rocky-noha.yaml similarity index 87% rename from config/deploy/os-nosdn-calipso_queens-noha.yaml rename to config/deploy/os-nosdn-calipso_rocky-noha.yaml index 48d93f49..b14ceed5 100644 --- a/config/deploy/os-nosdn-calipso_queens-noha.yaml +++ b/config/deploy/os-nosdn-calipso_rocky-noha.yaml @@ -4,7 +4,7 @@ global_params: deploy_options: containers: true - os_version: queens + os_version: rocky sdn_controller: false sfc: false vpn: false diff --git a/config/deploy/os-nosdn-queens-ha.yaml b/config/deploy/os-nosdn-rocky-ha.yaml similarity index 88% rename from config/deploy/os-nosdn-queens-ha.yaml rename to config/deploy/os-nosdn-rocky-ha.yaml index 88a40042..152a8840 100644 --- a/config/deploy/os-nosdn-queens-ha.yaml +++ b/config/deploy/os-nosdn-rocky-ha.yaml @@ -3,7 +3,7 @@ global_params: ha_enabled: true deploy_options: containers: true - os_version: queens + os_version: rocky sdn_controller: false tacker: false congress: false diff --git a/config/deploy/os-nosdn-queens-noha.yaml b/config/deploy/os-nosdn-rocky-noha.yaml similarity index 88% rename from config/deploy/os-nosdn-queens-noha.yaml rename to config/deploy/os-nosdn-rocky-noha.yaml index efadc31e..5fecfb6d 100644 --- a/config/deploy/os-nosdn-queens-noha.yaml +++ b/config/deploy/os-nosdn-rocky-noha.yaml @@ -3,7 +3,7 @@ global_params: ha_enabled: false deploy_options: containers: true - os_version: queens + os_version: rocky sdn_controller: false tacker: false congress: false diff --git a/config/deploy/os-odl-bgpvpn_queens-ha.yaml b/config/deploy/os-odl-bgpvpn_rocky-ha.yaml similarity index 89% rename from config/deploy/os-odl-bgpvpn_queens-ha.yaml rename to config/deploy/os-odl-bgpvpn_rocky-ha.yaml index 27a0caf6..a0833fd4 100644 --- a/config/deploy/os-odl-bgpvpn_queens-ha.yaml +++ b/config/deploy/os-odl-bgpvpn_rocky-ha.yaml @@ -4,7 +4,7 @@ global_params: deploy_options: containers: true - os_version: queens + os_version: rocky sdn_controller: opendaylight odl_version: master tacker: false diff --git a/config/deploy/os-odl-bgpvpn_queens-noha.yaml b/config/deploy/os-odl-bgpvpn_rocky-noha.yaml similarity index 89% rename from config/deploy/os-odl-bgpvpn_queens-noha.yaml rename to config/deploy/os-odl-bgpvpn_rocky-noha.yaml index 33382307..6bc5adf3 100644 --- a/config/deploy/os-odl-bgpvpn_queens-noha.yaml +++ b/config/deploy/os-odl-bgpvpn_rocky-noha.yaml @@ -4,7 +4,7 @@ global_params: deploy_options: containers: true - os_version: queens + os_version: rocky sdn_controller: opendaylight odl_version: master tacker: false diff --git a/config/deploy/os-odl-rocky-ha.yaml b/config/deploy/os-odl-rocky-ha.yaml new file mode 100644 index 00000000..8728bd8d --- /dev/null +++ b/config/deploy/os-odl-rocky-ha.yaml @@ -0,0 +1,13 @@ +--- +global_params: + ha_enabled: true + +deploy_options: + containers: true + os_version: rocky + sdn_controller: opendaylight + odl_version: oxygen + tacker: false + congress: false + sfc: false + vpn: false diff --git a/config/deploy/os-odl-rocky-noha.yaml b/config/deploy/os-odl-rocky-noha.yaml new file mode 100644 index 00000000..f6ceb81b --- /dev/null +++ b/config/deploy/os-odl-rocky-noha.yaml @@ -0,0 +1,13 @@ +--- +global_params: + ha_enabled: false + +deploy_options: + containers: true + os_version: rocky + sdn_controller: opendaylight + odl_version: oxygen + tacker: false + congress: false + sfc: false + vpn: false diff --git a/config/deploy/os-odl-sfc_queens-ha.yaml b/config/deploy/os-odl-sfc_rocky-ha.yaml similarity index 89% rename from config/deploy/os-odl-sfc_queens-ha.yaml rename to config/deploy/os-odl-sfc_rocky-ha.yaml index 0cd01466..3a1b6c93 100644 --- a/config/deploy/os-odl-sfc_queens-ha.yaml +++ b/config/deploy/os-odl-sfc_rocky-ha.yaml @@ -4,7 +4,7 @@ global_params: deploy_options: containers: true - os_version: queens + os_version: rocky sdn_controller: opendaylight odl_version: master tacker: false diff --git a/config/deploy/os-odl-sfc_queens-noha.yaml b/config/deploy/os-odl-sfc_rocky-noha.yaml similarity index 89% rename from config/deploy/os-odl-sfc_queens-noha.yaml rename to config/deploy/os-odl-sfc_rocky-noha.yaml index d091b8cf..8af873a5 100644 --- a/config/deploy/os-odl-sfc_queens-noha.yaml +++ b/config/deploy/os-odl-sfc_rocky-noha.yaml @@ -4,7 +4,7 @@ global_params: deploy_options: containers: true - os_version: queens + os_version: rocky sdn_controller: opendaylight odl_version: master tacker: false diff --git a/config/deploy/os-ovn-queens-ha.yaml b/config/deploy/os-ovn-rocky-ha.yaml similarity index 93% rename from config/deploy/os-ovn-queens-ha.yaml rename to config/deploy/os-ovn-rocky-ha.yaml index fe79068d..a2c5a865 100644 --- a/config/deploy/os-ovn-queens-ha.yaml +++ b/config/deploy/os-ovn-rocky-ha.yaml @@ -9,7 +9,7 @@ global_params: deploy_options: containers: true - os_version: queens + os_version: rocky sdn_controller: ovn tacker: false congress: false