openstack/puppet-openstack-integration
Code Issues Proposed changes

rename scenario003 to scenario-aio

Browse Source 
scenario003 is going to be a scenario gated in OpenStack Infra.
It was created to be a AIO scenario, for our testers, so let's rename it
to scenario-aio.

In a further iteration, scenario003 will be a scenario used by our CI.

Change-Id: I53852757d013abfae10e5f4afd41ddbb18da3b03
This commit is contained in:
Emilien Macchi 2016-02-24 14:50:52 -05:00
parent 82b4ea212d
commit 6c272cdf16
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
README.md
View File

@ -28,27 +28,27 @@ OpenStack Infrastructure is deploying two jobs per supported Operating System
OpenStack services are balanced between two scenarios because OpenStack
Infastructure Jenkins slaves can not afford the load of running all on the
same node.
One manifest (scenario003) is used for people who want to [run a simple All-In-One
One manifest (scenario-aio) is used for people who want to [run a simple All-In-One
scenario](#All-In-One).
| - | scenario001 | scenario002 | scenario003 |
|:----------:|:-----------:|:-----------:|:-----------:|
| 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 | 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 | |
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
@ -91,7 +91,7 @@ curl -sL http://git.openstack.org/cgit/openstack/puppet-openstack-integration/pl
```
Look at [Description](#description) to see which services it will install
(scenario003).
(scenario-aio).
Contributors

2
all-in-one.sh
View File

@ -43,7 +43,7 @@ rm -rf /tmp/puppet-openstack-integration
git clone git://git.openstack.org/openstack/puppet-openstack-integration /tmp/puppet-openstack-integration
cd /tmp/puppet-openstack-integration
export SCENARIO=scenario003
export SCENARIO=scenario-aio
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
source $SCRIPT_DIR/functions

0
fixtures/scenario003.pp → fixtures/scenario-aio.pp
View File