Merge "A keystone only controller deployment"

This commit is contained in:
Zuul 2018-03-11 21:51:15 +00:00 committed by Gerrit Code Review
commit ccbe1949fd
2 changed files with 120 additions and 81 deletions

View File

@ -64,84 +64,84 @@ 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:
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| - | scn001 | scn002 | scn003 | scn004 | scn006 | scn007 | scn009 | non-ha | ovh-ha | | - | scn000 | scn001 | scn002 | scn003 | scn004 | scn006 | scn007 | scn009 | non-ha | ovh-ha |
+================+========+========+========+========+========+========+========+========+========+ +================+========+========+========+========+========+========+========+========+========+========+
| openshift | | | | | | | X | | | | openshift | | | | | | | | X | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| keystone | X | X | X | X | X | X | | X | X | | keystone | X | X | X | X | X | X | X | | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| glance | rbd | swift | file | rgw | file | file | | file | file | | glance | | rbd | swift | file | rgw | file | 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 | | mysql | X | X | X | X | X | X | X | | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| neutron | ovs | ovs | ovs | ovs | ovs | ovn | | ovs | ovs | | neutron | | ovs | ovs | ovs | ovs | ovs | ovn | | ovs | ovs |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| neutron-bgpvpn | | | | wip | | | | | | | neutron-bgpvpn | | | | | wip | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| ovn | | | | | | X | | | | | ovn | | | | | | | X | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| neutron-l2gw | | | | wip | | | | | | | neutron-l2gw | | | | | wip | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| rabbitmq | X | X | X | X | X | X | | X | X | | rabbitmq | | X | X | X | X | X | X | | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| mongodb | | | | | | | | | | | mongodb | | | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| redis | X | X | | | | | | | | | redis | | X | X | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| haproxy | X | X | X | X | X | X | | X | X | | haproxy | | X | X | X | X | X | X | | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| memcached | X | X | X | X | X | X | | X | X | | memcached | | X | X | X | X | X | X | | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| pacemaker | X | X | X | X | X | X | | X | X | | pacemaker | | X | X | X | X | X | X | | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+- ------+--------+--------+--------+--------+--------+--------+--------+--------+
| nova | qemu | qemu | qemu | qemu | ironic | qemu | | qemu | qemu | | nova | | qemu | qemu | qemu | qemu | ironic | qemu | | qemu | qemu |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| ntp | X | X | X | X | X | X | X | X | X | | ntp | X | X | X | X | X | X | X | X | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| snmp | X | X | X | X | X | X | X | X | X | | snmp | X | X | X | X | X | X | X | X | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| timezone | X | X | X | X | X | X | X | X | X | | timezone | 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 | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+
| panko | X | X | | | | | | | | | panko | | X | X | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| barbican | | X | | | | | | | | | barbican | | | X | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| zaqar | | X | | | | | | | | | zaqar | | | X | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| ec2api | | X | | | | | | | | | ec2api | | | X | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| cephrgw | | | | X | | | | | | | cephrgw | | | | | X | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| tacker | | | | | | X | | | | | tacker | | | | | | | X | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| congress | | | | | | X | | | | | congress | | | | | | | X | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| cephmds | | | | X | | | | | | | cephmds | | | | | X | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| manila | | | | X | | | | | | | manila | | | | | X | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| collectd | X | | | | | | | | | | collectd | | X | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| fluentd | X | | | | | | | | | | fluentd | | X | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| sensu-client | X | | | | | | | | | | sensu-client | | X | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+

View File

@ -0,0 +1,39 @@
resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.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::RabbitMQ: ../../docker/services/pacemaker/rabbitmq.yaml
OS::TripleO::Services::HAproxy: ../../docker/services/pacemaker/haproxy.yaml
OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
OS::TripleO::Services::Keepalived: OS::Heat::None
OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None
OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None
parameter_defaults:
ControllerServices:
- OS::TripleO::Services::Clustercheck
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Keystone
- OS::TripleO::Services::MySQL
- OS::TripleO::Services::MySQLClient
- 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
- OS::TripleO::Services::Sshd
Debug: true
DockerPuppetDebug: True
NotificationDriver: 'noop'