cleanup: remove scenario004 bits
scenario004 bits are not used anymore. We'll add scenario004 again, but in THT, not here. Change-Id: I067b86aa2a7773a6afefe3c1b8af48602949b155
This commit is contained in:
parent
2159b2fc51
commit
a5dfb7ab22
64
README.md
64
README.md
|
@ -26,42 +26,28 @@ the same node.
|
|||
Service testing matrix
|
||||
----------------------
|
||||
|
||||
| - | scenario001 | scenario002 | scenario003 | scenario004 |multinode-nonha |
|
||||
|:--------------:|:-----------:|:-----------:|:-----------:|:-----------:|---------------:|
|
||||
| keystone | X | X | X | X | X |
|
||||
| glance | file | swift | file | file | swift |
|
||||
| cinder | | iscsi | | iscsi | iscsi |
|
||||
| heat | X | X | X | | X |
|
||||
| mysql | X | X | X | X | X |
|
||||
| neutron | ovs | ovs | ovs | ovs | X |
|
||||
| rabbitmq | X | X | X | X | X |
|
||||
| mongodb | X | | | | |
|
||||
| redis | X | | | | |
|
||||
| haproxy | X | X | X | X | X |
|
||||
| keepalived | X | X | X | X | X |
|
||||
| memcached | X | X | X | X | X |
|
||||
| pacemaker | X | X | X | X | X |
|
||||
| nova | qemu | qemu | qemu | qemu | X |
|
||||
| ntp | X | X | X | X | X |
|
||||
| snmp | X | X | X | X | X |
|
||||
| timezone | X | X | X | X | X |
|
||||
| sahara | | | X | | |
|
||||
| swift | | X | | | X |
|
||||
| aodh | X | | | | |
|
||||
| ceilometer | X | | | | |
|
||||
| gnocchi | X | | | | |
|
||||
| barbican | | | | X | |
|
||||
|
||||
|
||||
Note: Scenario004 only runs on releases newer than newton, since it contains
|
||||
services that are not available in those releases.
|
||||
|
||||
|
||||
Scenarios description
|
||||
---------------------
|
||||
|
||||
scenario001 deploys the Compute kit (Keystone, Nova, Glance, Neutron) and
|
||||
Sahara. Glance uses file backend because Swift is not installed.
|
||||
|
||||
multinode-nonha deploys the Compute kit with Cinder and Swift. Glance uses Swift
|
||||
backend.
|
||||
| - | scenario001 | scenario002 | scenario003 | multinode-nonha |
|
||||
|:--------------:|:-----------:|:-----------:|:-----------:|:---------------:|
|
||||
| keystone | X | X | X | X |
|
||||
| glance | file | swift | file | swift |
|
||||
| cinder | | iscsi | | iscsi |
|
||||
| heat | X | X | X | X |
|
||||
| mysql | X | X | X | X |
|
||||
| neutron | ovs | ovs | ovs | X |
|
||||
| rabbitmq | X | X | X | X |
|
||||
| mongodb | X | | | |
|
||||
| redis | X | | | |
|
||||
| haproxy | X | X | X | X |
|
||||
| keepalived | X | X | X | X |
|
||||
| memcached | X | X | X | X |
|
||||
| pacemaker | X | X | X | X |
|
||||
| nova | qemu | qemu | qemu | X |
|
||||
| ntp | X | X | X | X |
|
||||
| snmp | X | X | X | X |
|
||||
| timezone | X | X | X | X |
|
||||
| sahara | | | X | |
|
||||
| swift | | X | | X |
|
||||
| aodh | X | | | |
|
||||
| ceilometer | X | | | |
|
||||
| gnocchi | X | | | |
|
||||
| barbican | | X | | |
|
||||
|
|
|
@ -1,151 +0,0 @@
|
|||
heat_template_version: 2013-05-23
|
||||
|
||||
description: |
|
||||
HOT template to created resources deployed by scenario004.
|
||||
Note that Barbican is currently just getting a key order, however, the intent
|
||||
is to test encrypted volumes once support for that is added in t-h-t.
|
||||
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 }
|
||||
|
||||
key_order1:
|
||||
type: OS::Barbican::Order
|
||||
properties:
|
||||
name: key_order1
|
||||
type: asymmetric
|
||||
algorithm: rsa
|
||||
bit_length: 2048
|
||||
mode: cbc
|
||||
|
||||
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:
|
||||
key_info:
|
||||
description: Key-pair ordered from barbican
|
||||
value: {get_attr: [key_order1, show]}
|
||||
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 ] }
|
|
@ -1,44 +0,0 @@
|
|||
resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../heat-templates/net-config-multinode.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../heat-templates/net-config-multinode.yaml
|
||||
OS::TripleO::Services::BarbicanApi: /usr/share/openstack-tripleo-heat-templates/puppet/services/barbican-api.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ControllerServices:
|
||||
- OS::TripleO::Services::Kernel
|
||||
- OS::TripleO::Services::Keystone
|
||||
- OS::TripleO::Services::GlanceApi
|
||||
- OS::TripleO::Services::GlanceRegistry
|
||||
- OS::TripleO::Services::HeatApi
|
||||
- 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::NovaMetadata
|
||||
- OS::TripleO::Services::NovaScheduler
|
||||
- OS::TripleO::Services::Ntp
|
||||
- OS::TripleO::Services::Snmp
|
||||
- OS::TripleO::Services::Timezone
|
||||
- OS::TripleO::Services::NovaCompute
|
||||
- OS::TripleO::Services::NovaLibvirt
|
||||
- OS::TripleO::Services::CinderApi
|
||||
- OS::TripleO::Services::CinderBackup
|
||||
- OS::TripleO::Services::CinderScheduler
|
||||
- OS::TripleO::Services::CinderVolume
|
||||
- OS::TripleO::Services::BarbicanApi
|
||||
ControllerExtraConfig:
|
||||
nova::compute::libvirt::services::libvirt_virt_type: qemu
|
||||
nova::compute::libvirt::libvirt_virt_type: qemu
|
||||
Debug: true
|
||||
GlanceBackend: 'file'
|
Loading…
Reference in New Issue