Remove pingtest from THT
The pingtest isn't used anywhere in Train cycle, we can remove it. Change-Id: Ida2ddd1f880e09e930eac3dccd5b7e2989bc1bd2
This commit is contained in:
Emilien Macchi
parent
4c83dc4b94
commit
1e33ed8366
@ -1,144 +0,0 @@
|
||||
heat_template_version: ocata
|
||||
# Keep the template version old enough to support older release testing.
|
||||
# In mixed version test scenario, we can have a ping test triggered
|
||||
# after the overcloud installation just to make sure that it works.
|
||||
# If we move this template version then this scenario cannot work.
|
||||
|
||||
description: >
|
||||
HOT template to create a new neutron network plus a router to the public
|
||||
network, and for deploying a server into the new network. The template also
|
||||
assigns a floating IP address and sets security group rules. ADAPTED FROM
|
||||
https://raw.githubusercontent.com/openstack/heat-templates/master/hot/servers_in_new_neutron_net.yaml
|
||||
parameters:
|
||||
key_name:
|
||||
type: string
|
||||
description: Name of keypair to assign to servers
|
||||
default: 'pingtest_key'
|
||||
image:
|
||||
type: string
|
||||
description: Name of image to use for servers
|
||||
default: 'pingtest_image'
|
||||
public_net_name:
|
||||
type: string
|
||||
default: 'nova'
|
||||
description: >
|
||||
ID or name of public network for which floating IP addresses will be allocated
|
||||
private_net_name:
|
||||
type: string
|
||||
description: Name of private network to be created
|
||||
default: 'default-net'
|
||||
private_net_cidr:
|
||||
type: string
|
||||
description: Private network address (CIDR notation)
|
||||
default: '192.168.2.0/24'
|
||||
private_net_gateway:
|
||||
type: string
|
||||
description: Private network gateway address
|
||||
default: '192.168.2.1'
|
||||
private_net_pool_start:
|
||||
type: string
|
||||
description: Start of private network IP address allocation pool
|
||||
default: '192.168.2.100'
|
||||
private_net_pool_end:
|
||||
type: string
|
||||
default: '192.168.2.200'
|
||||
description: End of private network IP address allocation pool
|
||||
|
||||
resources:
|
||||
|
||||
key_pair:
|
||||
type: OS::Nova::KeyPair
|
||||
properties:
|
||||
save_private_key: true
|
||||
name: {get_param: key_name }
|
||||
|
||||
private_net:
|
||||
type: OS::Neutron::Net
|
||||
properties:
|
||||
name: { get_param: private_net_name }
|
||||
|
||||
private_subnet:
|
||||
type: OS::Neutron::Subnet
|
||||
properties:
|
||||
network_id: { get_resource: private_net }
|
||||
cidr: { get_param: private_net_cidr }
|
||||
gateway_ip: { get_param: private_net_gateway }
|
||||
allocation_pools:
|
||||
- start: { get_param: private_net_pool_start }
|
||||
end: { get_param: private_net_pool_end }
|
||||
|
||||
router:
|
||||
type: OS::Neutron::Router
|
||||
properties:
|
||||
external_gateway_info:
|
||||
network: { get_param: public_net_name }
|
||||
|
||||
router_interface:
|
||||
type: OS::Neutron::RouterInterface
|
||||
properties:
|
||||
router_id: { get_resource: router }
|
||||
subnet_id: { get_resource: private_subnet }
|
||||
|
||||
volume1:
|
||||
type: OS::Cinder::Volume
|
||||
properties:
|
||||
name: Volume1
|
||||
image: { get_param: image }
|
||||
size: 1
|
||||
|
||||
server1:
|
||||
type: OS::Nova::Server
|
||||
depends_on: volume1
|
||||
properties:
|
||||
name: Server1
|
||||
block_device_mapping:
|
||||
- device_name: vda
|
||||
volume_id: { get_resource: volume1 }
|
||||
flavor: { get_resource: test_flavor }
|
||||
key_name: { get_resource: key_pair }
|
||||
networks:
|
||||
- port: { get_resource: server1_port }
|
||||
|
||||
server1_port:
|
||||
type: OS::Neutron::Port
|
||||
properties:
|
||||
network_id: { get_resource: private_net }
|
||||
fixed_ips:
|
||||
- subnet_id: { get_resource: private_subnet }
|
||||
security_groups: [{ get_resource: server_security_group }]
|
||||
|
||||
server1_floating_ip:
|
||||
type: OS::Neutron::FloatingIP
|
||||
# TODO: investigate why we need this depends_on and if we could
|
||||
# replace it by router_id with get_resource: router_interface
|
||||
depends_on: router_interface
|
||||
properties:
|
||||
floating_network: { get_param: public_net_name }
|
||||
port_id: { get_resource: server1_port }
|
||||
|
||||
server_security_group:
|
||||
type: OS::Neutron::SecurityGroup
|
||||
properties:
|
||||
description: Add security group rules for server
|
||||
name: pingtest-security-group
|
||||
rules:
|
||||
- remote_ip_prefix: 0.0.0.0/0
|
||||
protocol: tcp
|
||||
port_range_min: 22
|
||||
port_range_max: 22
|
||||
- remote_ip_prefix: 0.0.0.0/0
|
||||
protocol: icmp
|
||||
|
||||
test_flavor:
|
||||
type: OS::Nova::Flavor
|
||||
properties:
|
||||
ram: 512
|
||||
vcpus: 1
|
||||
|
||||
outputs:
|
||||
server1_private_ip:
|
||||
description: IP address of server1 in private network
|
||||
value: { get_attr: [ server1, first_address ] }
|
||||
server1_public_ip:
|
||||
description: Floating IP address of server1 in public network
|
||||
value: { get_attr: [ server1_floating_ip, floating_ip_address ] }
|
||||
@ -29,15 +29,6 @@ valid_heat_template_versions = [
|
||||
'rocky',
|
||||
]
|
||||
|
||||
# We should have up-to-date the heat_template_version
|
||||
# for each template, although there are a few needing
|
||||
# an specific version, here we can add this exception
|
||||
# for certain templates.
|
||||
set_heat_template_versions_in_templates = {
|
||||
# Needed for mixed version pingtest.
|
||||
'./ci/pingtests/tenantvm_floatingip.yaml' : 'ocata',
|
||||
}
|
||||
|
||||
current_heat_template_version = valid_heat_template_versions[-1]
|
||||
|
||||
required_params = ['EndpointMap', 'ServiceNetMap', 'DefaultPasswords',
|
||||
@ -1034,17 +1025,7 @@ def validate(filename, param_map):
|
||||
if is_heat_template:
|
||||
tpl_template_version = str(tpl['heat_template_version'])
|
||||
|
||||
if filename in set_heat_template_versions_in_templates:
|
||||
if set_heat_template_versions_in_templates[filename] != tpl_template_version:
|
||||
print('ERROR: heat_template_version in template %s '
|
||||
'must be set to: %s'
|
||||
% (
|
||||
filename,
|
||||
set_heat_template_versions_in_templates[filename]
|
||||
)
|
||||
)
|
||||
return 1
|
||||
elif tpl_template_version not in valid_heat_template_versions:
|
||||
if tpl_template_version not in valid_heat_template_versions:
|
||||
print('ERROR: heat_template_version in template %s '
|
||||
'is not valid: %s (allowed values %s)'
|
||||
% (
|
||||
|
||||
@ -59,7 +59,6 @@
|
||||
- ^environments/kubernetes.*$
|
||||
- ^deployment/kubernetes/.*$
|
||||
- ci/environments/scenario006-multinode.yaml
|
||||
- ci/pingtests/scenario006-multinode.yaml
|
||||
- ^deployed-server/.*$
|
||||
- ^common/.*$
|
||||
- zuul.d/*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user