openstack/tripleo-heat-templates
Code Issues Proposed changes

Add scenario013: Octavia standalone without Ceph

Browse Source 
This patch adds a new CI scenario to support Octavia upgrade CI job
without Ceph until a limitation with standalone upgrade with a single
ceph-mon is resolved [1].

[1] https://bugs.launchpad.net/tripleo/+bug/1867144/

Change-Id: Id8562700ec93b64870f0fef5e0163dc5ef039eab
This commit is contained in:
Carlos Goncalves 2020-03-14 19:29:05 +01:00
parent 921f89e77c
commit 120cb95e22
2 changed files with 113 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
README.rst
View File

@ -65,80 +65,80 @@ Service testing matrix
The configuration for the CI scenarios will be defined in `tripleo-heat-templates/ci/` The configuration for the CI scenarios will be defined in `tripleo-heat-templates/ci/`
and should be executed according to the following table: and should be executed according to the following table:
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| - | scn000 | scn001 | scn002 | scn003 | scn004 | scn006 | scn007 | scn009 | scn010 | non-ha | ovh-ha | | - | scn000 | scn001 | scn002 | scn003 | scn004 | scn006 | scn007 | scn009 | scn010 | scn013 | non-ha | ovh-ha |
+================+========+========+========+========+========+========+========+========+========+========+========+ +================+========+========+========+========+========+========+========+========+========+========+========+========+
| keystone | X | X | X | X | X | X | X | | X | X | X | | keystone | X | X | X | X | X | X | X | | X | X | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| glance | | rbd | swift | file | rgw | file | file | | rbd | file | file | | glance | | rbd | swift | file | rgw | file | file | | rbd | file | file | file |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| cinder | | rbd | iscsi | | | | | | | | | | cinder | | rbd | iscsi | | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| heat | | X | X | | | | | | | | | | heat | | X | X | | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| ironic | | | | | | X | | | | | | | ironic | | | | | | X | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| mysql | X | X | X | X | X | X | X | | X | X | X | | mysql | X | X | X | X | X | X | X | | X | X | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| neutron | | ovn | ovn | ovn | ovn | ovn | ovs | | ovn | ovn | ovn | | neutron | | ovn | ovn | ovn | ovn | ovn | ovs | | ovn | ovn | ovn | ovn |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| neutron-bgpvpn | | | | | wip | | | | | | | | neutron-bgpvpn | | | | | wip | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| ovn | | | | | | | X | | | | | | ovn | | | | | | | X | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| neutron-l2gw | | | | | wip | | | | | | | | neutron-l2gw | | | | | wip | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| om-rpc | | rabbit | rabbit | amqp1 | rabbit | rabbit | rabbit | | rabbit | rabbit | rabbit | | om-rpc | | rabbit | rabbit | amqp1 | rabbit | rabbit | rabbit | | rabbit | rabbit | rabbit | rabbit |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| om-notify | | rabbit | rabbit | rabbit | rabbit | rabbit | rabbit | | rabbit | rabbit | rabbit | | om-notify | | rabbit | rabbit | rabbit | rabbit | rabbit | rabbit | | rabbit | rabbit | rabbit | rabbit |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| redis | | X | X | | | | | | | | | | redis | | X | X | | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| haproxy | | X | X | X | X | X | X | | X | X | X | | haproxy | | X | X | X | X | X | X | | X | X | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| memcached | | X | X | X | X | X | X | | X | X | X | | memcached | | X | X | X | X | X | X | | X | X | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| pacemaker | | X | X | X | X | X | X | | X | X | X | | pacemaker | | X | X | X | X | X | X | | X | X | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| nova | | qemu | qemu | qemu | qemu | ironic | qemu | | qemu | qemu | qemu | | nova | | qemu | qemu | qemu | qemu | ironic | qemu | | qemu | qemu | qemu | qemu |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| placement | | X | X | X | X | X | X | | X | X | X | | placement | | X | X | X | X | X | X | | X | X | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| ntp | X | X | X | X | X | X | X | X | X | X | X | | ntp | X | X | X | X | X | X | X | X | X | X | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| snmp | X | X | X | X | X | X | X | X | X | X | X | | snmp | X | X | X | X | X | X | X | X | X | X | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| timezone | X | X | X | X | X | X | X | X | X | X | X | | timezone | X | X | X | X | X | X | X | X | X | X | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| sahara | | | | X | | | | | | | | | sahara | | | | X | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| mistral | | | | X | | | | | | | | | mistral | | | | X | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| swift | | | X | | | | | | | | | | swift | | | X | | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| aodh | | X | X | | | | | | | | | | aodh | | X | X | | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| ceilometer | | X | X | | | | | | | | | | ceilometer | | X | X | | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| gnocchi | | rbd | swift | | | | | | | | | | gnocchi | | rbd | swift | | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| barbican | | | X | | | | | | | | | | barbican | | | X | | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| zaqar | | | X | | | | | | | | | | zaqar | | | X | | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| cephrgw | | | | | X | | | | | | | | cephrgw | | | | | X | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| cephmds | | | | | X | | | | | | | | cephmds | | | | | X | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| manila | | | | | X | | | | | | | | manila | | | | | X | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| collectd | | X | | | | | | | | | | | collectd | | X | | | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| designate | | | | X | | | | | | | | | designate | | | | X | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| octavia | | | | | | | | | X | | | | octavia | | | | | | | | | X | X | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| rear | | X | | | | | | | | | | | rear | | X | | | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| Extra Firewall | | | | X | | | | | | | | | Extra Firewall | | | | X | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+

36
ci/environments/scenario013-standalone.yaml Normal file
View File

@ -0,0 +1,36 @@
# This scenario is same as scenario10 but without Ceph.
resource_registry:
OS::TripleO::Services::Keepalived: OS::Heat::None
OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-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::Services::OctaviaApi: ../../deployment/octavia/octavia-api-container-puppet.yaml
OS::TripleO::Services::OctaviaHousekeeping: ../../deployment/octavia/octavia-housekeeping-container-puppet.yaml
OS::TripleO::Services::OctaviaHealthManager: ../../deployment/octavia/octavia-health-manager-container-puppet.yaml
OS::TripleO::Services::OctaviaWorker: ../../deployment/octavia/octavia-worker-container-puppet.yaml
OS::TripleO::Services::OctaviaDeploymentConfig: ../../deployment/octavia/octavia-deployment-config.yaml
OS::TripleO::Services::CinderApi: OS::Heat::None
OS::TripleO::Services::CinderBackup: OS::Heat::None
OS::TripleO::Services::CinderScheduler: OS::Heat::None
OS::TripleO::Services::CinderVolume: OS::Heat::None
OS::TripleO::Services::SwiftProxy: OS::Heat::None
OS::TripleO::Services::SwiftDispersion: OS::Heat::None
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
OS::TripleO::Services::SwiftStorage: OS::Heat::None
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
OS::TripleO::Services::SwiftStorage: OS::Heat::None
OS::TripleO::Services::Horizon: OS::Heat::None
parameter_defaults:
StandaloneExtraConfig:
octavia::controller::connection_retry_interval: 10
OctaviaAmphoraSshKeyFile: /home/zuul/.ssh/id_rsa.pub
OctaviaAmphoraImageFilename: /home/zuul/amphora.qcow2
OctaviaCaKeyPassphrase: 'upstreamci'
OctaviaManageNovaFlavor: true
OctaviaGenerateCerts: true
Debug: true
GlanceBackend: 'file'
ContainerCli: podman