Import multinode + pingtest from tripleo-ci
* Import multinode-3nodes roles data * Import multinode * Import tenantvm_floatingip pingtest We are importing these files from tripleo-ci because they contain some informations that need to be versionned (TripleO services, data binding, etc), specific to TripleO versions. Change-Id: I9d4ab144f98e8bd46cad2c29411d1270f6469b91
This commit is contained in:
parent
7020a72404
commit
ac70b82190
77
ci/environments/multinode-3nodes.yaml
Normal file
77
ci/environments/multinode-3nodes.yaml
Normal file
@ -0,0 +1,77 @@
|
|||||||
|
# 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::Core
|
||||||
|
- OS::TripleO::Services::Kernel
|
||||||
|
- OS::TripleO::Services::Keystone
|
||||||
|
- OS::TripleO::Services::GlanceApi
|
||||||
|
- OS::TripleO::Services::HeatApi
|
||||||
|
- OS::TripleO::Services::HeatApiCfn
|
||||||
|
- OS::TripleO::Services::HeatApiCloudwatch
|
||||||
|
- OS::TripleO::Services::HeatEngine
|
||||||
|
- 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::NovaPlacement
|
||||||
|
- OS::TripleO::Services::NovaMetadata
|
||||||
|
- OS::TripleO::Services::NovaScheduler
|
||||||
|
- OS::TripleO::Services::NovaConsoleauth
|
||||||
|
- OS::TripleO::Services::NovaVncProxy
|
||||||
|
- OS::TripleO::Services::Ntp
|
||||||
|
- OS::TripleO::Services::SwiftProxy
|
||||||
|
- OS::TripleO::Services::SwiftStorage
|
||||||
|
- OS::TripleO::Services::SwiftRingBuilder
|
||||||
|
- OS::TripleO::Services::Snmp
|
||||||
|
- OS::TripleO::Services::Timezone
|
||||||
|
- OS::TripleO::Services::TripleoPackages
|
||||||
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
|
- OS::TripleO::Services::NovaCompute
|
||||||
|
- OS::TripleO::Services::NovaLibvirt
|
||||||
|
|
||||||
|
- name: Controller
|
||||||
|
CountDefault: 1
|
||||||
|
ServicesDefault:
|
||||||
|
- OS::TripleO::Services::CACerts
|
||||||
|
- OS::TripleO::Services::CinderBackup
|
||||||
|
- OS::TripleO::Services::CinderVolume
|
||||||
|
- OS::TripleO::Services::Core
|
||||||
|
- OS::TripleO::Services::Kernel
|
||||||
|
- OS::TripleO::Services::MySQL
|
||||||
|
- OS::TripleO::Services::RabbitMQ
|
||||||
|
- OS::TripleO::Services::HAproxy
|
||||||
|
- OS::TripleO::Services::Keepalived
|
||||||
|
- OS::TripleO::Services::Memcached
|
||||||
|
- OS::TripleO::Services::Pacemaker
|
||||||
|
- OS::TripleO::Services::Ntp
|
||||||
|
- OS::TripleO::Services::Snmp
|
||||||
|
- OS::TripleO::Services::Timezone
|
||||||
|
- OS::TripleO::Services::TripleoPackages
|
||||||
|
- OS::TripleO::Services::TripleoFirewall
|
47
ci/environments/multinode.yaml
Normal file
47
ci/environments/multinode.yaml
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
resource_registry:
|
||||||
|
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||||
|
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||||
|
|
||||||
|
parameter_defaults:
|
||||||
|
ControllerServices:
|
||||||
|
- OS::TripleO::Services::CinderApi
|
||||||
|
- OS::TripleO::Services::CinderScheduler
|
||||||
|
- OS::TripleO::Services::CinderVolume
|
||||||
|
- OS::TripleO::Services::Kernel
|
||||||
|
- OS::TripleO::Services::Keystone
|
||||||
|
- OS::TripleO::Services::GlanceApi
|
||||||
|
- OS::TripleO::Services::HeatApi
|
||||||
|
- OS::TripleO::Services::HeatApiCfn
|
||||||
|
- OS::TripleO::Services::HeatApiCloudwatch
|
||||||
|
- OS::TripleO::Services::HeatEngine
|
||||||
|
- OS::TripleO::Services::MySQL
|
||||||
|
- OS::TripleO::Services::NeutronDhcpAgent
|
||||||
|
- OS::TripleO::Services::NeutronL3Agent
|
||||||
|
- OS::TripleO::Services::NeutronMetadataAgent
|
||||||
|
- OS::TripleO::Services::NeutronServer
|
||||||
|
- OS::TripleO::Services::NeutronCorePlugin
|
||||||
|
- OS::TripleO::Services::NeutronOvsAgent
|
||||||
|
- OS::TripleO::Services::RabbitMQ
|
||||||
|
- 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::NovaPlacement
|
||||||
|
- OS::TripleO::Services::NovaMetadata
|
||||||
|
- OS::TripleO::Services::NovaScheduler
|
||||||
|
- OS::TripleO::Services::Ntp
|
||||||
|
- OS::TripleO::Services::SwiftProxy
|
||||||
|
- OS::TripleO::Services::SwiftStorage
|
||||||
|
- OS::TripleO::Services::SwiftRingBuilder
|
||||||
|
- OS::TripleO::Services::Snmp
|
||||||
|
- OS::TripleO::Services::Timezone
|
||||||
|
- OS::TripleO::Services::NovaCompute
|
||||||
|
- OS::TripleO::Services::NovaLibvirt
|
||||||
|
ControllerExtraConfig:
|
||||||
|
nova::compute::libvirt::services::libvirt_virt_type: qemu
|
||||||
|
nova::compute::libvirt::libvirt_virt_type: qemu
|
||||||
|
# Required for Centos 7.3 and Qemu 2.6.0
|
||||||
|
nova::compute::libvirt::libvirt_cpu_mode: 'none'
|
||||||
|
SwiftCeilometerPipelineEnabled: False
|
142
ci/pingtests/tenantvm_floatingip.yaml
Normal file
142
ci/pingtests/tenantvm_floatingip.yaml
Normal file
@ -0,0 +1,142 @@
|
|||||||
|
heat_template_version: 2013-05-23
|
||||||
|
|
||||||
|
description: >
|
||||||
|
This template resides in tripleo-ci for Mitaka CI jobs only.
|
||||||
|
For Newton and beyond, please look in THT.
|
||||||
|
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 ] }
|
Loading…
Reference in New Issue
Block a user