diff --git a/README.md b/README.md index dbb62ad42..c2250f320 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,6 @@ Description OpenStack Infrastructure is deploying four jobs per supported Operating System (Ubuntu and CentOS): scenario001, scenario002, scenario003 and scenario004. -For CentOS it is also deploying a job(scenario000) with very tiny installation. The manifest files under the fixtures directory is used to compose the required services for each senario. The manifest files under the manifests directory @@ -43,44 +42,44 @@ the same node. One manifest (scenario-aio) is used for people who want to [run a simple All-In-One scenario](#all-in-one). -| - | scenario000 | scenario001 | scenario002 | scenario003 | scenario004 | scenario-aio | -|:----------:|:-----------:|:-----------:|:-----------:|:-----------:|:-----------:|:------------:| -| ssl | yes | yes | yes | yes | yes | no | -| ipv6 | centos8 | centos8 | centos8 | centos8 | centos8 | no | -| keystone | X | X | X | X | X | X | -| glance | | rbd | swift | file | swift+rgw | file | -| nova | | rbd | X | X | rbd | X | -| placement | | X | X | X | X | X | -| neutron | | ovs | ovs | linuxbridge | ovs | ovs | -| cinder | | rbd | iscsi | | | iscsi | -| ceilometer | | X | X | | | | -| aodh | | X | X | | | | -| designate | | | | bind | | | -| backup | | | swift | | | | -| gnocchi | | rbd | swift | | | | -| ec2api | | | X | | | | -| heat | | X | | X | | | -| swift | | | X | | | | -| sahara | | | | X | | | -| trove | | | | X | | | -| horizon | | | | X | | X | -| ironic | | | X | | | | -| zaqar | | | X | | | | -| murano | | | | X | | | -| magnum | | | | X | | | -| mistral | | | | X | | | -| barbican | | | X | X | | | -| ceph | | X | | | X | | -| ceph rgw | | | | | X | | -| vitrage | | X | | | | | -| watcher | | | | | X | | -| bgpvpn-api | | | | | X | | -| bgp-dr | | | | | X | | -| redis | | X | X | | | | -| l2gw | | | | | X | | -| octavia | | | | | X | | -| om rpc | amqp1 | amqp1 | rabbit | rabbit | rabbit | rabbit | -| om notify | rabbit | rabbit | rabbit | rabbit | rabbit | rabbit | +| - | scenario001 | scenario002 | scenario003 | scenario004 | scenario-aio | +|:----------:|:-----------:|:-----------:|:-----------:|:-----------:|:------------:| +| ssl | yes | yes | yes | yes | no | +| ipv6 | centos8 | centos8 | centos8 | centos8 | no | +| keystone | X | X | X | X | X | +| glance | rbd | swift | file | swift+rgw | file | +| nova | rbd | X | X | rbd | X | +| placement | X | X | X | X | X | +| neutron | ovs | ovs | linuxbridge | ovs | ovs | +| cinder | rbd | iscsi | | | iscsi | +| ceilometer | X | X | | | | +| aodh | X | X | | | | +| designate | | | bind | | | +| backup | | swift | | | | +| gnocchi | rbd | swift | | | | +| ec2api | | X | | | | +| heat | X | | X | | | +| swift | | X | | | | +| sahara | | | X | | | +| trove | | | X | | | +| horizon | | | X | | X | +| ironic | | X | | | | +| zaqar | | X | | | | +| murano | | | X | | | +| magnum | | | X | | | +| mistral | | | X | | | +| barbican | | X | X | | | +| ceph | X | | | X | | +| ceph rgw | | | | X | | +| vitrage | X | | | | | +| watcher | | | | X | | +| bgpvpn-api | | | | X | | +| bgp-dr | | | | X | | +| redis | X | X | | | | +| l2gw | | | | X | | +| octavia | | | | X | | +| om rpc | amqp1 | rabbit | rabbit | rabbit | rabbit | +| om notify | rabbit | rabbit | rabbit | rabbit | rabbit | When the Jenkins slave is created, the *run_tests.sh* script will be executed. This script will execute *install_modules.sh* that prepare /etc/puppet/modules diff --git a/fixtures/scenario000.pp b/fixtures/scenario000.pp deleted file mode 100644 index b6b94b21e..000000000 --- a/fixtures/scenario000.pp +++ /dev/null @@ -1,86 +0,0 @@ -# -# Copyright 2015 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Keystone only puppet deployment - -if $::os['name'] == 'Ubuntu' { - $ssl = false -} else { - $ssl = true -} - -if $::osfamily == 'RedHat' { - # (amoralej) - disable selinux defaults until - # https://tickets.puppetlabs.com/browse/PUP-7559 is fixed - Concat { selinux_ignore_defaults => true } - File { selinux_ignore_defaults => true } -} - -case $::osfamily { - 'Debian': { - $ipv6 = false - $om_rpc = 'rabbit' - $om_notify = 'rabbit' - } - 'RedHat': { - $ipv6 = true - $om_rpc = 'amqp' - $om_notify = 'rabbit' - } - default: { - fail("Unsupported osfamily (${::osfamily})") - } -} - -include openstack_integration -class { 'openstack_integration::config': - ssl => $ssl, - ipv6 => $ipv6, - rpc_backend => $om_rpc, - notify_backend => $om_notify, -} -if $ssl { - include openstack_integration::cacert -} -include openstack_integration::apache -include openstack_integration::memcached -include openstack_integration::rabbitmq -if ($om_rpc == 'amqp') { - include openstack_integration::qdr -} -include openstack_integration::mysql -class { 'openstack_integration::keystone': - # NOTE(sileht): Telemetry autoscaling tempest tests can't renew token, so we - # use a long one - token_expiration => '2400', -} - -# turn off glance, nova, neutron -class { 'openstack_integration::provision': - glance => false, - nova => false, - neutron => false, -} - -# Expected keystone resources logged to -# keystone-resources.txt -class { 'openstack_integration::tempest': - glance => false, - nova => false, - neutron => false, - configure_images => false, - configure_networks => false, -} diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml index 6513ef70c..457990a16 100644 --- a/zuul.d/integration.yaml +++ b/zuul.d/integration.yaml @@ -13,34 +13,6 @@ vars: puppet: 7 -- job: - name: puppet-openstack-integration-6-scenario000 - parent: puppet-openstack-integration-6 - abstract: true - vars: - scenario: scenario000 - -- job: - name: puppet-openstack-integration-7-scenario000 - parent: puppet-openstack-integration-7 - abstract: true - vars: - scenario: scenario000 - -- job: - name: puppet-openstack-integration-7-scenario000-tempest-centos-8-stream - parent: puppet-openstack-integration-7-scenario000 - voting: false - nodeset: centos-8-stream - -- job: - name: puppet-openstack-integration-7-scenario000-tempest-centos-9-stream - parent: puppet-openstack-integration-7-scenario000 - voting: false - nodeset: - nodes: - - name: centos-9-stream - label: centos-9-stream - job: name: puppet-openstack-integration-6-scenario001 parent: puppet-openstack-integration-6 diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index efaf7b000..c4e34fd2b 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -54,12 +54,10 @@ - puppet-openstack-integration-6-scenario002-tempest-ubuntu-focal - puppet-openstack-integration-6-scenario003-tempest-ubuntu-focal - puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal - - puppet-openstack-integration-7-scenario000-tempest-centos-8-stream - puppet-openstack-integration-7-scenario001-tempest-centos-8-stream - puppet-openstack-integration-7-scenario002-tempest-centos-8-stream - puppet-openstack-integration-7-scenario003-tempest-centos-8-stream - puppet-openstack-integration-7-scenario004-tempest-centos-8-stream - - puppet-openstack-integration-7-scenario000-tempest-centos-9-stream - puppet-openstack-integration-7-scenario001-tempest-centos-9-stream - puppet-openstack-integration-7-scenario002-tempest-centos-9-stream - puppet-openstack-integration-7-scenario003-tempest-centos-9-stream