openstack/puppet-openstack-integration
Code Issues Proposed changes

scenario001: run 2 workers

Browse Source 
Run 2 workers for OpenStack services so we save RAM.

Change-Id: Id4ad28ff37967c19a0f314075d50a4739ea9a17c
This commit is contained in:
Emilien Macchi 2015-09-28 18:41:01 -04:00
parent 1076d442be
commit cc1b9c5db6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fixtures/scenario001.pp
View File

@ -100,7 +100,7 @@ class { '::keystone':
include ::apache include ::apache
class { '::keystone::wsgi::apache': class { '::keystone::wsgi::apache':
ssl => false, ssl => false,
workers => 4, workers => 2,
} }
class { '::keystone::roles::admin': class { '::keystone::roles::admin':
email => 'test@example.tld', email => 'test@example.tld',
@ -124,14 +124,14 @@ class { '::glance::api':
verbose => true, verbose => true,
database_connection => 'mysql://glance:glance@127.0.0.1/glance?charset=utf8', database_connection => 'mysql://glance:glance@127.0.0.1/glance?charset=utf8',
keystone_password => 'a_big_secret', keystone_password => 'a_big_secret',
workers => 4, workers => 2,
} }
class { '::glance::registry': class { '::glance::registry':
debug => true, debug => true,
verbose => true, verbose => true,
database_connection => 'mysql://glance:glance@127.0.0.1/glance?charset=utf8', database_connection => 'mysql://glance:glance@127.0.0.1/glance?charset=utf8',
keystone_password => 'a_big_secret', keystone_password => 'a_big_secret',
workers => 4, workers => 2,
} }
class { '::glance::notify::rabbitmq': class { '::glance::notify::rabbitmq':
rabbit_userid => 'glance', rabbit_userid => 'glance',
@ -179,7 +179,7 @@ class { '::neutron::agents::metadata':
debug => true, debug => true,
auth_password => 'a_big_secret', auth_password => 'a_big_secret',
shared_secret => 'a_big_secret', shared_secret => 'a_big_secret',
metadata_workers => 4, metadata_workers => 2,
} }
class { '::neutron::agents::lbaas': class { '::neutron::agents::lbaas':
debug => true, debug => true,
@ -220,9 +220,9 @@ class { '::nova::api':
identity_uri => 'http://127.0.0.1:35357/', identity_uri => 'http://127.0.0.1:35357/',
osapi_v3 => true, osapi_v3 => true,
neutron_metadata_proxy_shared_secret => 'a_big_secret', neutron_metadata_proxy_shared_secret => 'a_big_secret',
osapi_compute_workers => 4, osapi_compute_workers => 2,
ec2_workers => 4, ec2_workers => 2,
metadata_workers => 4, metadata_workers => 2,
default_floating_pool => 'public', default_floating_pool => 'public',
} }
class { '::nova::cert': } class { '::nova::cert': }
@ -266,7 +266,7 @@ class { '::cinder::api':
keystone_password => 'a_big_secret', keystone_password => 'a_big_secret',
identity_uri => 'http://127.0.0.1:35357/', identity_uri => 'http://127.0.0.1:35357/',
default_volume_type => 'BACKEND_1', default_volume_type => 'BACKEND_1',
service_workers => 4, service_workers => 2,
} }
class { '::cinder::quota': } class { '::cinder::quota': }
class { '::cinder::scheduler': } class { '::cinder::scheduler': }
@ -324,7 +324,7 @@ class { '::ceilometer::api':
} }
class { '::ceilometer::wsgi::apache': class { '::ceilometer::wsgi::apache':
ssl => false, ssl => false,
workers => '4', workers => '2',
} }
class { '::ceilometer::collector': } class { '::ceilometer::collector': }
class { '::ceilometer::expirer': } class { '::ceilometer::expirer': }

2
run_tests.sh
View File

@ -85,4 +85,4 @@ fi
wget http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img -P /tmp/openstack/tempest wget http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img -P /tmp/openstack/tempest
# run a scenario that validates Keystone, Nova, Glance, Neutron, Ceilometer, Cinder and Sahara # run a scenario that validates Keystone, Nova, Glance, Neutron, Ceilometer, Cinder and Sahara
cd /tmp/openstack/tempest; tox -eall -- --concurrency=4 smoke cd /tmp/openstack/tempest; tox -eall -- --concurrency=2 smoke