From 3dcc92966d744b2ec52bf3e176302761732987b3 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 12 Mar 2020 16:41:49 -0400 Subject: [PATCH] ci: remove unused multinode scenarios These multinode scenarios aren't used anymore, let's just clean them up. Change-Id: I80aa84b72d9d6353c9f7a13ac2ffbccb6d7e935f --- .../multinode-3nodes-registry.yaml | 24 --- ci/environments/multinode-3nodes.yaml | 87 -------- .../scenario001-multinode-containers.yaml | 187 ------------------ .../scenario002-multinode-containers.yaml | 110 ----------- .../scenario003-multinode-containers.yaml | 137 ------------- .../scenario004-multinode-containers.yaml | 140 ------------- .../scenario006-multinode-containers.yaml | 64 ------ .../scenario012-multinode-containers.yaml | 86 -------- 8 files changed, 835 deletions(-) delete mode 100644 ci/environments/multinode-3nodes-registry.yaml delete mode 100644 ci/environments/multinode-3nodes.yaml delete mode 100644 ci/environments/scenario001-multinode-containers.yaml delete mode 100644 ci/environments/scenario002-multinode-containers.yaml delete mode 100644 ci/environments/scenario003-multinode-containers.yaml delete mode 100644 ci/environments/scenario004-multinode-containers.yaml delete mode 100644 ci/environments/scenario006-multinode-containers.yaml delete mode 100644 ci/environments/scenario012-multinode-containers.yaml diff --git a/ci/environments/multinode-3nodes-registry.yaml b/ci/environments/multinode-3nodes-registry.yaml deleted file mode 100644 index f479f56a61..0000000000 --- a/ci/environments/multinode-3nodes-registry.yaml +++ /dev/null @@ -1,24 +0,0 @@ -resource_registry: - OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml - OS::TripleO::ControllerApi::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml - OS::TripleO::Services::Core: multinode-core.yaml - OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml - OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml - OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml - OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml - OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml - OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml - OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml - OS::TripleO::Services::Keepalived: OS::Heat::None - # Some infra instances don't pass the ping test but are otherwise working. - # Since the OVB jobs also test this functionality we can shut it off here. - OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml - -parameter_defaults: - ControllerExtraConfig: - nova::compute::libvirt::services::libvirt_virt_type: qemu - nova::compute::libvirt::libvirt_virt_type: qemu - tripleo::profile::base::metrics::qdr::router_mode: interior - SwiftCeilometerPipelineEnabled: False - # Remove ContainerCli once this scenario is tested on CentOS8 - ContainerCli: docker diff --git a/ci/environments/multinode-3nodes.yaml b/ci/environments/multinode-3nodes.yaml deleted file mode 100644 index b648b6fc49..0000000000 --- a/ci/environments/multinode-3nodes.yaml +++ /dev/null @@ -1,87 +0,0 @@ -# Specifies which roles (groups of nodes) will be deployed -# Note this is used as an input to the various *.j2.yaml -# jinja2 templates, so that they are converted into *.yaml -# during the plan creation (via a mistral action/workflow). -# -# The format is a list, with the following format: -# -# * name: (string) mandatory, name of the role, must be unique -# -# CountDefault: (number) optional, default number of nodes, defaults to 0 -# sets the default for the {{role.name}}Count parameter in overcloud.yaml -# -# HostnameFormatDefault: (string) optional default format string for hostname -# defaults to '%stackname%-{{role.name.lower()}}-%index%' -# sets the default for {{role.name}}HostnameFormat parameter in overcloud.yaml -# -# ServicesDefault: (list) optional default list of services to be deployed -# on the role, defaults to an empty list. Sets the default for the -# {{role.name}}Services parameter in overcloud.yaml - -- name: ControllerApi - CountDefault: 1 - ServicesDefault: - - OS::TripleO::Services::CACerts - - OS::TripleO::Services::CinderApi - - OS::TripleO::Services::CinderScheduler - - OS::TripleO::Services::Docker - - OS::TripleO::Services::Kernel - - OS::TripleO::Services::GlanceApi - - OS::TripleO::Services::NeutronDhcpAgent - - OS::TripleO::Services::NeutronL3Agent - - OS::TripleO::Services::NeutronMetadataAgent - - OS::TripleO::Services::NeutronApi - - OS::TripleO::Services::NeutronCorePlugin - - OS::TripleO::Services::NeutronOvsAgent - - OS::TripleO::Services::NovaConductor - - OS::TripleO::Services::NovaApi - - OS::TripleO::Services::PlacementApi - - OS::TripleO::Services::NovaMetadata - - OS::TripleO::Services::NovaScheduler - - OS::TripleO::Services::NovaVncProxy - - OS::TripleO::Services::SwiftProxy - - OS::TripleO::Services::SwiftStorage - - OS::TripleO::Services::SwiftRingBuilder - - OS::TripleO::Services::Snmp - - OS::TripleO::Services::Timesync - - OS::TripleO::Services::Timezone - - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::TripleoFirewall - - OS::TripleO::Services::NovaCompute - - OS::TripleO::Services::NovaLibvirt - - OS::TripleO::Services::NovaMigrationTarget - - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::Sshd - - OS::TripleO::Services::Iscsid - - OS::TripleO::Services::Multipathd - -- name: Controller - CountDefault: 1 - tags: - - primary - - controller - ServicesDefault: - - OS::TripleO::Services::CACerts - - OS::TripleO::Services::CinderBackup - - OS::TripleO::Services::CinderVolume - - OS::TripleO::Services::Clustercheck - - OS::TripleO::Services::ContainerImagePrepare - - OS::TripleO::Services::Docker - - OS::TripleO::Services::Kernel - - OS::TripleO::Services::MySQL - - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::OsloMessagingRpc - - OS::TripleO::Services::OsloMessagingNotify - - OS::TripleO::Services::HAproxy - - OS::TripleO::Services::Keepalived - - OS::TripleO::Services::Keystone - - OS::TripleO::Services::Memcached - - OS::TripleO::Services::Pacemaker - - OS::TripleO::Services::Snmp - - OS::TripleO::Services::Timesync - - OS::TripleO::Services::Timezone - - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::TripleoFirewall - - OS::TripleO::Services::Sshd - - OS::TripleO::Services::Iscsid - - OS::TripleO::Services::Multipathd diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml deleted file mode 100644 index 9d57545071..0000000000 --- a/ci/environments/scenario001-multinode-containers.yaml +++ /dev/null @@ -1,187 +0,0 @@ -resource_registry: - OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml - OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml - OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml - OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml - OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml - OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml - OS::TripleO::Services::CeilometerAgentCentral: ../../deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml - OS::TripleO::Services::CeilometerAgentNotification: ../../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml - OS::TripleO::Services::CeilometerAgentIpmi: ../../deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml - OS::TripleO::Services::ComputeCeilometerAgent: ../../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml - OS::TripleO::Services::Collectd: ../../deployment/metrics/collectd-container-puppet.yaml - OS::TripleO::Services::MetricsQdr: ../../deployment/metrics/qdr-container-puppet.yaml - OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml - OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml - OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml - OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml - OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml - OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml - OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml - OS::TripleO::Services::Rsyslog: ../../deployment/logging/rsyslog-container-puppet.yaml - OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml - OS::TripleO::Services::CinderBackup: ../../deployment/cinder/cinder-backup-pacemaker-puppet.yaml - OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml - OS::TripleO::Services::Keepalived: OS::Heat::None - #Needs to run scenario001 - # Some infra instances don't pass the ping test but are otherwise working. - # Since the OVB jobs also test this functionality we can shut it off here. - OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml - -parameter_defaults: - ControllerServices: - - OS::TripleO::Services::CACerts - - OS::TripleO::Services::Clustercheck - - OS::TripleO::Services::ContainerImagePrepare - - OS::TripleO::Services::Docker - - OS::TripleO::Services::Kernel - - OS::TripleO::Services::Keystone - - OS::TripleO::Services::LoginDefs - - OS::TripleO::Services::GlanceApi - - OS::TripleO::Services::HeatApi - - OS::TripleO::Services::HeatApiCfn - - OS::TripleO::Services::HeatEngine - - OS::TripleO::Services::MySQL - - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronApi - - OS::TripleO::Services::NeutronCorePlugin - - OS::TripleO::Services::OVNDBs - - OS::TripleO::Services::OVNController - - OS::TripleO::Services::OVNMetadataAgent - - OS::TripleO::Services::OsloMessagingRpc - - OS::TripleO::Services::OsloMessagingNotify - - OS::TripleO::Services::HAproxy - - OS::TripleO::Services::Keepalived - - OS::TripleO::Services::Memcached - - OS::TripleO::Services::Pacemaker - - OS::TripleO::Services::NovaConductor - - OS::TripleO::Services::NovaApi - - OS::TripleO::Services::PlacementApi - - OS::TripleO::Services::NovaMetadata - - OS::TripleO::Services::NovaScheduler - - OS::TripleO::Services::Snmp - - OS::TripleO::Services::Sshd - - OS::TripleO::Services::Securetty - - OS::TripleO::Services::Timesync - - OS::TripleO::Services::Timezone - - OS::TripleO::Services::NovaCompute - - OS::TripleO::Services::NovaLibvirt - - OS::TripleO::Services::NovaMigrationTarget - - OS::TripleO::Services::Redis - - OS::TripleO::Services::AodhApi - - OS::TripleO::Services::AodhEvaluator - - OS::TripleO::Services::AodhNotifier - - OS::TripleO::Services::AodhListener - - OS::TripleO::Services::CeilometerAgentCentral - - OS::TripleO::Services::CeilometerAgentIpmi - - OS::TripleO::Services::CeilometerAgentNotification - - OS::TripleO::Services::ComputeCeilometerAgent - - OS::TripleO::Services::GnocchiApi - - OS::TripleO::Services::GnocchiMetricd - - OS::TripleO::Services::GnocchiStatsd - - OS::TripleO::Services::CephMgr - - OS::TripleO::Services::CephMon - - OS::TripleO::Services::CephOSD - - OS::TripleO::Services::CephClient - - OS::TripleO::Services::CinderApi - - OS::TripleO::Services::CinderBackup - - OS::TripleO::Services::CinderScheduler - - OS::TripleO::Services::CinderVolume - - OS::TripleO::Services::Collectd - - OS::TripleO::Services::MetricsQdr - - OS::TripleO::Services::Rsyslog - - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::TripleoFirewall - - OS::TripleO::Services::Iscsid - - OS::TripleO::Services::Multipathd - - ControllerExtraConfig: - nova::compute::libvirt::services::libvirt_virt_type: qemu - nova::compute::libvirt::libvirt_virt_type: qemu - # NOTE(sileht): To decrease the time test_telemetry_integration takes We - # configure Ceilometer to poll more, We configure the - # 'ceilometer-high-rate' Gnocchi archive policy to keep 1 point every 60s. - # The test will take 2 minutes instead of 10 minutes. Note that tempest - # telemetry.alarm_granularity must in sync with the archive policy, 60s - # too. - ceilometer::agent::polling::polling_interval: 15 - # NOTE(mmagr): uncomment when QDR mesh will actually work (followup on review.opendev.org/702754) - #tripleo::profile::base::metrics::qdr::router_mode: interior - ManagePolling: true - ManagePipeline: true - CeilometerEnableGnocchi: true - PipelinePublishers: - - gnocchi://?archive_policy=ceilometer-high-rate - EventPipelinePublishers: - - gnocchi://?archive_policy=ceilometer-high-rate - CeilometerQdrPublishEvents: true - ManageEventPipeline: true - - Debug: true - DockerPuppetDebug: True - CephAnsibleDisksConfig: - devices: - - /dev/loop3 - journal_size: 512 - osd_scenario: collocated - CephPoolDefaultPgNum: 32 - CephAnsibleRepo: "tripleo-centos-ceph-nautilus" - CephPoolDefaultSize: 1 - CephPools: - - name: altrbd - pg_num: 8 - rule_name: replicated_rule - CephAnsibleExtraConfig: - centos_package_dependencies: [] - ceph_osd_docker_memory_limit: '1g' - ceph_mds_docker_memory_limit: '1g' - handler_health_mon_check_retries: 10 - handler_health_mon_check_delay: 20 - CephAnsibleSkipTags: '' - #NOTE: These ID's and keys should be regenerated for - # a production deployment. What is here is suitable for - # developer and CI testing only. - CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' - CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ==' - CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' - CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw==' - CephAnsiblePlaybookVerbosity: 1 - CephAnsibleEnvironmentVariables: - ANSIBLE_SSH_RETRIES: '4' - DEFAULT_FORKS: '3' - NovaEnableRbdBackend: true - CinderEnableRbdBackend: true - CinderRbdExtraPools: altrbd - CinderBackupBackend: ceph - GlanceBackend: rbd - GnocchiBackend: rbd - CinderEnableIscsiBackend: false - GnocchiArchivePolicy: 'ceilometer-high-rate' - BannerText: | - ****************************************************************** - * This system is for the use of authorized users only. Usage of * - * this system may be monitored and recorded by system personnel. * - * Anyone using this system expressly consents to such monitoring * - * and is advised that if such monitoring reveals possible * - * evidence of criminal activity, system personnel may provide * - * the evidence from such monitoring to law enforcement officials.* - ****************************************************************** - CollectdConnectionType: amqp1 - CollectdExtraPlugins: - - rrdtool - CollectdEnableSensubility: true - LoggingServers: - - host: 127.0.0.1 - port: 24224 - RsyslogElasticsearchSetting: - Server: '127.0.0.1:9200' - TtyValues: - - console - - tty1 - - tty2 - - tty3 - - tty4 - - tty5 - - tty6 - # Remove ContainerCli once this scenario is tested on CentOS8 - ContainerCli: docker diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml deleted file mode 100644 index 9401fa29e3..0000000000 --- a/ci/environments/scenario002-multinode-containers.yaml +++ /dev/null @@ -1,110 +0,0 @@ -resource_registry: - OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml - OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml - OS::TripleO::Services::BarbicanApi: ../../deployment/barbican/barbican-api-container-puppet.yaml - OS::TripleO::Services::Zaqar: ../../deployment/zaqar/zaqar-container-puppet.yaml - OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml - OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml - OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml - OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml - OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml - OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml - OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml - OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml - OS::TripleO::Services::CinderBackup: ../../deployment/cinder/cinder-backup-pacemaker-puppet.yaml - OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml - OS::TripleO::Services::BarbicanBackendSimpleCrypto: ../../deployment/barbican/barbican-backend-simple-crypto-puppet.yaml - OS::TripleO::Services::Keepalived: OS::Heat::None - # Some infra instances don't pass the ping test but are otherwise working. - # Since the OVB jobs also test this functionality we can shut it off here. - OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml - -parameter_defaults: - ControllerServices: - - OS::TripleO::Services::CACerts - - OS::TripleO::Services::Clustercheck - - OS::TripleO::Services::ContainerImagePrepare - - OS::TripleO::Services::Docker - - OS::TripleO::Services::Kernel - - OS::TripleO::Services::Keystone - - OS::TripleO::Services::GlanceApi - - OS::TripleO::Services::HeatApi - - OS::TripleO::Services::HeatApiCfn - - OS::TripleO::Services::HeatEngine - - OS::TripleO::Services::MySQL - - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronApi - - OS::TripleO::Services::NeutronCorePlugin - - OS::TripleO::Services::OVNDBs - - OS::TripleO::Services::OVNController - - OS::TripleO::Services::OVNMetadataAgent - - OS::TripleO::Services::OsloMessagingRpc - - OS::TripleO::Services::OsloMessagingNotify - - OS::TripleO::Services::HAproxy - - OS::TripleO::Services::Keepalived - - OS::TripleO::Services::Memcached - - OS::TripleO::Services::Pacemaker - - OS::TripleO::Services::NovaConductor - - OS::TripleO::Services::NovaApi - - OS::TripleO::Services::PlacementApi - - OS::TripleO::Services::NovaMetadata - - OS::TripleO::Services::NovaScheduler - - OS::TripleO::Services::Snmp - - OS::TripleO::Services::Timesync - - OS::TripleO::Services::Timezone - - OS::TripleO::Services::NovaCompute - - OS::TripleO::Services::NovaLibvirt - - OS::TripleO::Services::NovaMigrationTarget - - OS::TripleO::Services::CinderApi - - OS::TripleO::Services::CinderBackup - - OS::TripleO::Services::CinderScheduler - - OS::TripleO::Services::CinderVolume - - OS::TripleO::Services::SwiftProxy - - OS::TripleO::Services::SwiftStorage - - OS::TripleO::Services::SwiftRingBuilder - - OS::TripleO::Services::BarbicanApi - - OS::TripleO::Services::BarbicanBackendSimpleCrypto - - OS::TripleO::Services::Zaqar - - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::TripleoFirewall - - OS::TripleO::Services::Sshd - - OS::TripleO::Services::Iscsid - - OS::TripleO::Services::Multipathd - - OS::TripleO::Services::Redis - - OS::TripleO::Services::AodhApi - - OS::TripleO::Services::AodhEvaluator - - OS::TripleO::Services::AodhNotifier - - OS::TripleO::Services::AodhListener - - OS::TripleO::Services::CeilometerAgentCentral - - OS::TripleO::Services::CeilometerAgentIpmi - - OS::TripleO::Services::CeilometerAgentNotification - - OS::TripleO::Services::ComputeCeilometerAgent - - OS::TripleO::Services::GnocchiApi - - OS::TripleO::Services::GnocchiMetricd - - OS::TripleO::Services::GnocchiStatsd - ControllerExtraConfig: - nova::compute::libvirt::services::libvirt_virt_type: qemu - nova::compute::libvirt::libvirt_virt_type: qemu - # NOTE(sileht): To decrease the time test_telemetry_integration takes We - # configure Ceilometer to poll more, We configure the - # 'ceilometer-high-rate' Gnocchi archive policy to keep 1 point every 60s. - # The test will take 2 minutes instead of 10 minutes. Note that tempest - # telemetry.alarm_granularity must in sync with the archive policy, 60s - # too. - ceilometer::agent::polling::polling_interval: 15 - ManagePolling: true - ManagePipeline: true - CeilometerEnableGnocchi: true - PipelinePublishers: - - gnocchi://?archive_policy=ceilometer-high-rate - EventPipelinePublishers: - - gnocchi://?archive_policy=ceilometer-high-rate - GnocchiArchivePolicy: 'ceilometer-high-rate' - Debug: true - DockerPuppetDebug: True - ZaqarMessageStore: 'swift' - ZaqarManagementStore: 'sqlalchemy' - SwiftCeilometerPipelineEnabled: false - BarbicanSimpleCryptoGlobalDefault: true - # Remove ContainerCli once this scenario is tested on CentOS8 - ContainerCli: docker diff --git a/ci/environments/scenario003-multinode-containers.yaml b/ci/environments/scenario003-multinode-containers.yaml deleted file mode 100644 index ee058041fb..0000000000 --- a/ci/environments/scenario003-multinode-containers.yaml +++ /dev/null @@ -1,137 +0,0 @@ -resource_registry: - OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml - OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml - OS::TripleO::Services::SaharaApi: ../../deployment/sahara/sahara-api-container-puppet.yaml - OS::TripleO::Services::SaharaEngine: ../../deployment/sahara/sahara-engine-container-puppet.yaml - OS::TripleO::Services::MistralApi: ../../deployment/mistral/mistral-api-container-puppet.yaml - OS::TripleO::Services::MistralEngine: ../../deployment/mistral/mistral-engine-container-puppet.yaml - OS::TripleO::Services::MistralExecutor: ../../deployment/mistral/mistral-executor-container-puppet.yaml - OS::TripleO::Services::MistralEventEngine: ../../deployment/mistral/mistral-event-engine-container-puppet.yaml - OS::TripleO::Services::OsloMessagingRpc: ../../deployment/messaging/rpc-qdrouterd-container-puppet.yaml - OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml - OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml - OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml - OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml - OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml - OS::TripleO::Services::DesignateApi: ../../deployment/experimental/designate/designate-api-container-puppet.yaml - OS::TripleO::Services::DesignateCentral: ../../deployment/experimental/designate/designate-central-container-puppet.yaml - OS::TripleO::Services::DesignateProducer: ../../deployment/experimental/designate/designate-producer-container-puppet.yaml - OS::TripleO::Services::DesignateWorker: ../../deployment/experimental/designate/designate-worker-container-puppet.yaml - OS::TripleO::Services::DesignateMDNS: ../../deployment/experimental/designate/designate-mdns-container-puppet.yaml - OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml - OS::TripleO::Services::Keepalived: OS::Heat::None - # Some infra instances don't pass the ping test but are otherwise working. - # Since the OVB jobs also test this functionality we can shut it off here. - OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml - -parameter_defaults: - ControllerServices: - - OS::TripleO::Services::CACerts - - OS::TripleO::Services::Clustercheck - - OS::TripleO::Services::ContainerImagePrepare - - OS::TripleO::Services::Docker - - OS::TripleO::Services::Kernel - - OS::TripleO::Services::Keystone - - OS::TripleO::Services::GlanceApi - - OS::TripleO::Services::MySQL - - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronApi - - OS::TripleO::Services::NeutronCorePlugin - - OS::TripleO::Services::OVNDBs - - OS::TripleO::Services::OVNController - - OS::TripleO::Services::OVNMetadataAgent - - OS::TripleO::Services::OsloMessagingRpc - - OS::TripleO::Services::OsloMessagingNotify - - OS::TripleO::Services::HAproxy - - OS::TripleO::Services::Keepalived - - OS::TripleO::Services::Memcached - - OS::TripleO::Services::Pacemaker - - OS::TripleO::Services::NovaConductor - - OS::TripleO::Services::NovaApi - - OS::TripleO::Services::PlacementApi - - OS::TripleO::Services::NovaMetadata - - OS::TripleO::Services::NovaScheduler - - OS::TripleO::Services::Snmp - - OS::TripleO::Services::Timesync - - OS::TripleO::Services::Timezone - - OS::TripleO::Services::NovaCompute - - OS::TripleO::Services::NovaMigrationTarget - - OS::TripleO::Services::NovaLibvirt - - OS::TripleO::Services::SaharaApi - - OS::TripleO::Services::SaharaEngine - - OS::TripleO::Services::MistralApi - - OS::TripleO::Services::MistralEngine - - OS::TripleO::Services::MistralExecutor - - OS::TripleO::Services::MistralEventEngine - - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::TripleoFirewall - - OS::TripleO::Services::Sshd - - OS::TripleO::Services::Iscsid - - OS::TripleO::Services::Multipathd - - OS::TripleO::Services::DesignateApi - - OS::TripleO::Services::DesignateCentral - - OS::TripleO::Services::DesignateProducer - - OS::TripleO::Services::DesignateWorker - - OS::TripleO::Services::DesignateMDNS - ControllerExtraConfig: - nova::compute::libvirt::services::libvirt_virt_type: qemu - nova::compute::libvirt::libvirt_virt_type: qemu - ControllerIPs: - ctlplane: - - 192.168.24.251 - Debug: true - DockerPuppetDebug: True - # we don't deploy Swift so we switch to file backend. - GlanceBackend: 'file' - KeystoneTokenProvider: 'fernet' - SwiftCeilometerPipelineEnabled: false - NotificationDriver: 'noop' - NeutronPluginExtensions: qos,port_security,dns - RpcPort: 31459 - NotifyPort: 5672 - DesignatePools: | - - name: default - # The name is immutable. There will be no option to change the name after - # creation and the only way will to change it will be to delete it - # (and all zones associated with it) and recreate it. - description: Default Pool - - attributes: {} - - # List out the NS records for zones hosted within this pool - # This should be a record that is created outside of designate, that - # points to the public IP of the controller node. - ns_records: - - hostname: ns1-1.example.org. - priority: 1 - - # List out the nameservers for this pool. These are the actual BIND servers. - # We use these to verify changes have propagated to all nameservers. - nameservers: - - host: 192.168.24.251 - port: 53 - - # List out the targets for this pool. For BIND there will be one - # entry for each BIND server, as we have to run rndc command on each server - targets: - - type: bind9 - description: BIND9 Server 1 - - # List out the designate-mdns servers from which BIND servers should - # request zone transfers (AXFRs) from. - # This should be the IP of the controller node. - # If you have multiple controllers you can add multiple masters - # by running designate-mdns on them, and adding them here. - masters: - - host: 127.0.0.1 - port: 5354 - - # BIND Configuration options - options: - host: 192.168.24.251 - port: 53 - rndc_host: 192.168.24.251 - rndc_port: 953 - rndc_key_file: /etc/rndc.key - # Remove ContainerCli once this scenario is tested on CentOS8 - ContainerCli: docker diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml deleted file mode 100644 index b59f49a80b..0000000000 --- a/ci/environments/scenario004-multinode-containers.yaml +++ /dev/null @@ -1,140 +0,0 @@ -resource_registry: - OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml - OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml - OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml - OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml - OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml - OS::TripleO::Services::CephMds: ../../deployment/ceph-ansible/ceph-mds.yaml - OS::TripleO::Services::CephRgw: ../../deployment/ceph-ansible/ceph-rgw.yaml - OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml - OS::TripleO::Services::SwiftProxy: OS::Heat::None - OS::TripleO::Services::SwiftStorage: OS::Heat::None - OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None - OS::TripleO::Services::ManilaApi: ../../deployment/manila/manila-api-container-puppet.yaml - OS::TripleO::Services::ManilaScheduler: ../../deployment/manila/manila-scheduler-container-puppet.yaml - OS::TripleO::Services::ManilaShare: ../../deployment/manila/manila-share-pacemaker-puppet.yaml - OS::TripleO::Services::ManilaBackendCephFs: ../../deployment/manila/manila-backend-cephfs.yaml - # TODO: in Queens, re-add bgp-vpn and l2gw services when - # containerized. - # https://bugs.launchpad.net/bugs/1713612 - # OS::TripleO::Services::NeutronBgpVpnApi: ../../deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml - # OS::TripleO::Services::NeutronL2gwApi: ../../deployment/neutron/neutron-l2gw-api-container-puppet.yaml - # OS::TripleO::Services::NeutronL2gwAgent: ../../deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml - # These enable Pacemaker - OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml - OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml - OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml - OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml - OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml - OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml - OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml - OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml - OS::TripleO::Services::Keepalived: OS::Heat::None - # Some infra instances don't pass the ping test but are otherwise working. - # Since the OVB jobs also test this functionality we can shut it off here. - OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml - - -parameter_defaults: - ControllerServices: - - OS::TripleO::Services::CACerts - - OS::TripleO::Services::CephMds - - OS::TripleO::Services::CephMgr - - OS::TripleO::Services::CephMon - - OS::TripleO::Services::CephOSD - - OS::TripleO::Services::CephRgw - - OS::TripleO::Services::Clustercheck - - OS::TripleO::Services::ContainerImagePrepare - - OS::TripleO::Services::Docker - - OS::TripleO::Services::Kernel - - OS::TripleO::Services::Keystone - - OS::TripleO::Services::GlanceApi - - OS::TripleO::Services::MySQL - - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronApi - - OS::TripleO::Services::NeutronCorePlugin - - OS::TripleO::Services::OVNDBs - - OS::TripleO::Services::OVNController - - OS::TripleO::Services::OVNMetadataAgent - - OS::TripleO::Services::OsloMessagingRpc - - OS::TripleO::Services::OsloMessagingNotify - - OS::TripleO::Services::HAproxy - - OS::TripleO::Services::Keepalived - - OS::TripleO::Services::ManilaApi - - OS::TripleO::Services::ManilaScheduler - - OS::TripleO::Services::ManilaBackendCephFs - - OS::TripleO::Services::ManilaShare - - OS::TripleO::Services::Memcached - - OS::TripleO::Services::Pacemaker - - OS::TripleO::Services::NovaConductor - - OS::TripleO::Services::NovaApi - - OS::TripleO::Services::PlacementApi - - OS::TripleO::Services::NovaMetadata - - OS::TripleO::Services::NovaScheduler - - OS::TripleO::Services::Snmp - - OS::TripleO::Services::Timesync - - OS::TripleO::Services::Timezone - - OS::TripleO::Services::NovaCompute - - OS::TripleO::Services::NovaLibvirt - - OS::TripleO::Services::NovaMigrationTarget - - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::TripleoFirewall - - OS::TripleO::Services::Sshd - - OS::TripleO::Services::Iscsid - - OS::TripleO::Services::Multipathd - # TODO: in Queens, re-add bgp-vpn and l2gw services when - # containerized. - # https://bugs.launchpad.net/bugs/1713612 - # - OS::TripleO::Services::NeutronBgpVpnApi - # - OS::TripleO::Services::NeutronL2gwApi - # - OS::TripleO::Services::NeutronL2gwAgent - ControllerExtraConfig: - nova::compute::libvirt::services::libvirt_virt_type: qemu - nova::compute::libvirt::libvirt_virt_type: qemu - Debug: true - DockerPuppetDebug: True - CephAnsibleDisksConfig: - devices: - - /dev/loop3 - journal_size: 512 - journal_collocation: true - osd_scenario: collocated - # Without MDS and RGW we create 5 pools, totalling 160 PGs at 32 PGs each - # With MDS and RGW instead we create 9 pools, so we lower the PG size - CephPoolDefaultPgNum: 16 - ManilaCephFSDataPoolPGNum: 16 - ManilaCephFSMetadataPoolPGNum: 16 - CephAnsibleRepo: "tripleo-centos-ceph-nautilus" - CephPoolDefaultSize: 1 - CephAnsibleExtraConfig: - centos_package_dependencies: [] - ceph_osd_docker_memory_limit: '1g' - ceph_mds_docker_memory_limit: '1g' - handler_health_mon_check_retries: 10 - handler_health_mon_check_delay: 20 - CephAnsibleSkipTags: '' - #NOTE: These ID's and keys should be regenerated for - # a production deployment. What is here is suitable for - # developer and CI testing only. - CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' - CephClusterName: mycephcluster - CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ==' - CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' - CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw==' - NovaEnableRbdBackend: true - CinderEnableRbdBackend: true - CinderBackupBackend: ceph - CeilometerEnableGnocchi: true - GlanceBackend: rbd - GnocchiBackend: rbd - CinderEnableIscsiBackend: false - SwiftCeilometerPipelineEnabled: false - # TODO: in Queens, re-add bgp-vpn and l2gw services when - # containerized. - # https://bugs.launchpad.net/bugs/1713612 - # NeutronServicePlugins: 'router,bgpvpn,l2gw' - # BgpvpnServiceProvider: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default' - # L2gwServiceProvider: ['L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default'] - NotificationDriver: 'noop' - # Remove ContainerCli once this scenario is tested on CentOS8 - ContainerCli: docker diff --git a/ci/environments/scenario006-multinode-containers.yaml b/ci/environments/scenario006-multinode-containers.yaml deleted file mode 100644 index 04f313320f..0000000000 --- a/ci/environments/scenario006-multinode-containers.yaml +++ /dev/null @@ -1,64 +0,0 @@ -resource_registry: - OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml - OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml - OS::TripleO::Services::NovaIronic: ../deployment/nova/nova-ironic-container-puppet.yaml - OS::TripleO::Services::IronicApi: ../deployment/ironic/ironic-api-container-puppet.yaml - OS::TripleO::Services::IronicConductor: ../deployment/ironic/ironic-conductor-container-puppet.yaml - OS::TripleO::Services::IronicPxe: ../deployment/ironic/ironic-pxe-container-puppet.yaml - -parameter_defaults: - ControllerServices: - - OS::TripleO::Services::Clustercheck - - OS::TripleO::Services::ContainerImagePrepare - - OS::TripleO::Services::Docker - - OS::TripleO::Services::Kernel - - OS::TripleO::Services::Keystone - - OS::TripleO::Services::GlanceApi - - OS::TripleO::Services::IronicApi - - OS::TripleO::Services::IronicConductor - - OS::TripleO::Services::IronicPxe - - OS::TripleO::Services::MySQL - - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronApi - - OS::TripleO::Services::NeutronCorePlugin - - OS::TripleO::Services::OVNDBs - - OS::TripleO::Services::OVNController - - OS::TripleO::Services::OVNMetadataAgent - - OS::TripleO::Services::OsloMessagingRpc - - OS::TripleO::Services::OsloMessagingNotify - - OS::TripleO::Services::HAproxy - - OS::TripleO::Services::Keepalived - - OS::TripleO::Services::Memcached - - OS::TripleO::Services::Pacemaker - - OS::TripleO::Services::NovaConductor - - OS::TripleO::Services::NovaApi - - OS::TripleO::Services::NovaIronic - - OS::TripleO::Services::PlacementApi - - OS::TripleO::Services::NovaMetadata - - OS::TripleO::Services::NovaScheduler - - OS::TripleO::Services::Snmp - - OS::TripleO::Services::Sshd - - OS::TripleO::Services::Securetty - - OS::TripleO::Services::Timesync - - OS::TripleO::Services::Timezone - - OS::TripleO::Services::Redis - - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::TripleoFirewall - - Debug: true - DockerPuppetDebug: True - BannerText: | - ****************************************************************** - * This system is for the use of authorized users only. Usage of * - * this system may be monitored and recorded by system personnel. * - * Anyone using this system expressly consents to such monitoring * - * and is advised that if such monitoring reveals possible * - * evidence of criminal activity, system personnel may provide * - * the evidence from such monitoring to law enforcement officials.* - ****************************************************************** - # we don't deploy Swift so we switch to file backend. - GlanceBackend: 'file' - IronicCleaningDiskErase: 'metadata' - NotificationDriver: 'noop' - # Remove ContainerCli once this scenario is tested on CentOS8 - ContainerCli: docker diff --git a/ci/environments/scenario012-multinode-containers.yaml b/ci/environments/scenario012-multinode-containers.yaml deleted file mode 100644 index 1570535c7a..0000000000 --- a/ci/environments/scenario012-multinode-containers.yaml +++ /dev/null @@ -1,86 +0,0 @@ -resource_registry: - OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml - OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml - OS::TripleO::Services::NovaIronic: ../../deployment/nova/nova-ironic-container-puppet.yaml - OS::TripleO::Services::IronicApi: ../../deployment/ironic/ironic-api-container-puppet.yaml - OS::TripleO::Services::IronicConductor: ../../deployment/ironic/ironic-conductor-container-puppet.yaml - OS::TripleO::Services::IronicPxe: ../../deployment/ironic/ironic-pxe-container-puppet.yaml - # These enable Pacemaker - OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml - OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml - OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml - OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml - OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml - OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml - OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml - # Some infra instances don't pass the ping test but are otherwise working. - # Since the OVB jobs also test this functionality we can shut it off here. - OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml - OS::TripleO::NodeExtraConfigPost: ../common/vbmc_setup.yaml - OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml - OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Ansible - -parameter_defaults: - ControllerServices: - - OS::TripleO::Services::Clustercheck - - OS::TripleO::Services::ContainerImagePrepare - - OS::TripleO::Services::Docker - - OS::TripleO::Services::Keystone - - OS::TripleO::Services::GlanceApi - - OS::TripleO::Services::IronicApi - - OS::TripleO::Services::IronicConductor - - OS::TripleO::Services::IronicPxe - - OS::TripleO::Services::MySQL - - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronApi - - OS::TripleO::Services::NeutronCorePlugin - - OS::TripleO::Services::OVNDBs - - OS::TripleO::Services::OVNController - - OS::TripleO::Services::OVNMetadataAgent - - OS::TripleO::Services::OsloMessagingRpc - - OS::TripleO::Services::OsloMessagingNotify - - OS::TripleO::Services::HAproxy - - OS::TripleO::Services::Memcached - - OS::TripleO::Services::Pacemaker - - OS::TripleO::Services::NovaConductor - - OS::TripleO::Services::NovaApi - - OS::TripleO::Services::NovaIronic - - OS::TripleO::Services::PlacementApi - - OS::TripleO::Services::NovaMetadata - - OS::TripleO::Services::NovaScheduler - - OS::TripleO::Services::Snmp - - OS::TripleO::Services::SwiftProxy - - OS::TripleO::Services::SwiftStorage - - OS::TripleO::Services::SwiftRingBuilder - - OS::TripleO::Services::Timesync - - OS::TripleO::Services::Timezone - - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::TripleoFirewall - - OS::TripleO::Services::Sshd - - OS::TripleO::Services::Iscsid - - OS::TripleO::Services::Multipathd - - OS::TripleO::Services::CinderApi - - OS::TripleO::Services::CinderScheduler - - OS::TripleO::Services::CinderVolume - - ControllerExtraConfig: - nova::compute::libvirt::services::libvirt_virt_type: qemu - nova::compute::libvirt::libvirt_virt_type: qemu - Debug: true - DockerPuppetDebug: True - NotificationDriver: 'noop' - SwiftCeilometerPipelineEnabled: false - IronicCleaningDiskErase: 'metadata' - NovaSchedulerDiscoverHostsInCellsInterval: 15 - NeutronMechanismDrivers: ovn,ansible - NeutronNetworkType: vlan - NeutronTypeDrivers: local,vxlan,vlan,flat - IronicDefaultNetworkInterface: neutron - IronicAutomatedClean: false - IronicApiMaxRetries: 180 - NeutronFlatNetworks: datacentre - NeutronNetworkVLANRanges: 'datacentre:500:599,tenant:300:399' - ML2HostConfigs: { "net-ans-br": { "ansible_network_os": "openvswitch", "ansible_host": "127.0.0.1", "ansible_user": "root", "ansible_ssh_private_key_file": "/etc/puppet/ci-key"}} - NeutronBridgeMappings: 'datacentre:br-ex,tenant:br-tenant' - # Remove ContainerCli once this scenario is tested on CentOS8 - ContainerCli: docker