openstack
/
openstack-chef-repo
Code Issues Proposed changes

Fix memcached_servers setting for integration test 

When running with chef-local, the search that is used to determine the
list of memcached_servers fails, leaving this setting empty for
integration tests. As a workaround, set the corresponding variable
explicitly in the allinone environmnet.

Also fix the Rakefile in order to allow the integration test to be
run more than once without issues.

Change-Id: I526de86e674477075c8ea51b31473d7a376723d7
This commit is contained in:
Jens Rosenboom 2017-02-09 14:32:06 +01:00
parent 6162b549cc
commit 5c9be13219
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Rakefile
View File

@ -163,11 +163,11 @@ def _run_nova_tests(pass) # rubocop:disable Metrics/MethodLength
)
uuid = `sudo bash -c ". /root/openrc && openstack volume show --format yaml test_volume_#{pass} | grep "^id:" | cut -d ':' -f 2"`
_run_commands('nova server create', {
'openstack' => ['server list', "server create --image cirros --flavor m1.nano --block-device-mapping vdb=#{uuid.strip}:::1 test"],
'openstack' => ['server list', "server create --image cirros --flavor m1.nano --block-device-mapping vdb=#{uuid.strip}:::1 test#{pass}"],
'sleep' => ['40'] }
)
_run_commands('nova server cleanup', {
'openstack' => ['server list', 'server show test', 'server delete test'],
'openstack' => ['server list', "server show test#{pass}", "server delete test#{pass}"],
'sleep' => ['25']}
)
_run_commands('nova server query', {
@ -210,7 +210,7 @@ desc "Integration test on Infra"
task :integration => [:create_key, :berks_vendor] do
log_dir = ENV['WORKSPACE']+'/logs'
# This is a workaround for allowing chef-client to run in local mode
sh %(sudo mkdir /etc/chef && sudo cp .chef/encrypted_data_bag_secret /etc/chef/openstack_data_bag_secret)
sh %(sudo mkdir -p /etc/chef && sudo cp .chef/encrypted_data_bag_secret /etc/chef/openstack_data_bag_secret)
_run_env_queries
# Three passes to make sure of cookbooks idempotency

1
environments/allinone-ubuntu16.json
View File

@ -25,6 +25,7 @@
"dashboard": {
"server_hostname": "localhost"
},
"memcached_servers": [ "127.0.0.1:11211" ],
"mq": {
"user": "admin"
},