From a01d02071048d4e04c225da89aa4b23f629b779d Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 10 Jan 2018 11:31:47 -0800 Subject: [PATCH] Remove unused test-environments They are now in THT, no need to keep them here. Depends-On:I6277603f19513539d4dc493543c9d4671d4af2ca Change-Id: I4b81a6f6ad6ecc32b3e3351ec03eb8a3f85cf849 --- test-environments/multinode-3nodes.yaml | 10 ------- test-environments/multinode-core.yaml | 37 ------------------------- 2 files changed, 47 deletions(-) delete mode 100644 test-environments/multinode-3nodes.yaml delete mode 100644 test-environments/multinode-core.yaml diff --git a/test-environments/multinode-3nodes.yaml b/test-environments/multinode-3nodes.yaml deleted file mode 100644 index a3ec7ae92..000000000 --- a/test-environments/multinode-3nodes.yaml +++ /dev/null @@ -1,10 +0,0 @@ -resource_registry: - OS::TripleO::Controller::Net::SoftwareConfig: ../heat-templates/net-config-multinode.yaml - OS::TripleO::ControllerApi::Net::SoftwareConfig: ../heat-templates/net-config-multinode.yaml - OS::TripleO::Services::Core: multinode-core.yaml - -parameter_defaults: - ControllerExtraConfig: - nova::compute::libvirt::services::libvirt_virt_type: qemu - nova::compute::libvirt::libvirt_virt_type: qemu - SwiftCeilometerPipelineEnabled: False diff --git a/test-environments/multinode-core.yaml b/test-environments/multinode-core.yaml deleted file mode 100644 index f9c23861c..000000000 --- a/test-environments/multinode-core.yaml +++ /dev/null @@ -1,37 +0,0 @@ -heat_template_version: 2016-04-08 - -description: > - OpenStack Core Service - -parameters: - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. This - mapping overrides those in ServiceNetMapDefaults. - type: json - DefaultPasswords: - default: {} - type: json - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - Debug: - type: string - default: '' - -resources: - -outputs: - role_data: - description: Role data for the Keystone role. - value: - service_name: core - config_settings: - tripleo.core.firewall_rules: - '999 core': - proto: 'udp' - dport: - - 4789