openstack/puppet-openstack-integration
Code Issues Proposed changes

create scenario003 to relax other scenarios

Browse Source 
Create scenario003 that will install and test:
* keystone/nova/neutron/glance
* trove (moved from scenario001)
* horizon/heat/sahara (moved from scenario002)

Change-Id: I39870bbac6f2f9a050f85772d1fb0f6ac839e410
This commit is contained in:
Emilien Macchi 2016-02-24 15:04:55 -05:00
parent 6c272cdf16
commit a129a0cf05
4 changed files with 55 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
README.md
View File

@ -31,24 +31,24 @@ same node.
One manifest (scenario-aio) is used for people who want to [run a simple All-In-One
scenario](#All-In-One).
| - | scenario001 | scenario002 | scenario-aio |
|:----------:|:-----------:|:-----------:|:------------:|
| keystone | X | X | X |
| glance | rbd | file | file |
| nova | rbd | X | X |
| neutron | X | X | X |
| cinder | rbd | iscsi | iscsi |
| ceilometer | X | | |
| aodh | X | | |
| gnocchi | rbd | | |
| heat | | X | |
| swift | | X | |
| sahara | | X | |
| trove | X | | |
| horizon | | X | X |
| ironic | | X | |
| ceph | X | | |
| mongodb | | X | |
| - | scenario001 | scenario002 | scenario003 | scenario-aio |
|:----------:|:-----------:|:-----------:|:-----------:|:-------------:
| keystone | X | X | X | X |
| glance | rbd | file | file | file |
| nova | rbd | X | X | X |
| neutron | X | X | X | X |
| cinder | rbd | X | | iscsi |
| ceilometer | X | | | |
| aodh | X | | | |
| gnocchi | rbd | | | |
| heat | | | X | |
| swift | | X | | |
| sahara | | | X | |
| trove | | | X | |
| horizon | | | X | X |
| ironic | | X | | |
| ceph | X | | | |
| mongodb | | X | | |
When the Jenkins slave is created, the *run_tests.sh* script will executed.
This script will execute *install_modules.sh* that prepare /etc/puppet/modules

2
fixtures/scenario001.pp
View File

@ -31,7 +31,6 @@ class { '::openstack_integration::cinder':
include ::openstack_integration::ceilometer
include ::openstack_integration::aodh
include ::openstack_integration::gnocchi
include ::openstack_integration::trove
include ::openstack_integration::ceph
include ::openstack_integration::provision
@ -39,5 +38,4 @@ class { '::openstack_integration::tempest':
cinder => true,
ceilometer => true,
aodh => true,
trove => true,
}

10
fixtures/scenario002.pp
View File

@ -21,9 +21,6 @@ include ::openstack_integration::keystone
include ::openstack_integration::glance
include ::openstack_integration::neutron
include ::openstack_integration::nova
include ::openstack_integration::heat
include ::openstack_integration::horizon
include ::openstack_integration::sahara
include ::openstack_integration::swift
include ::openstack_integration::ironic
include ::openstack_integration::mongodb
@ -44,9 +41,6 @@ case $::osfamily {
}
class { '::openstack_integration::tempest':
horizon => true,
sahara => true,
heat => true,
swift => true,
ironic => $ironic_enabled,
swift => true,
ironic => $ironic_enabled,
}

35
fixtures/scenario003.pp Normal file
View File

@ -0,0 +1,35 @@
#
# 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.
#
include ::openstack_integration
include ::openstack_integration::rabbitmq
include ::openstack_integration::mysql
include ::openstack_integration::keystone
include ::openstack_integration::glance
include ::openstack_integration::neutron
include ::openstack_integration::nova
include ::openstack_integration::trove
include ::openstack_integration::horizon
include ::openstack_integration::heat
include ::openstack_integration::sahara
include ::openstack_integration::provision
class { '::openstack_integration::tempest':
trove => true,
sahara => true,
horizon => true,
heat => true,
}