Use docker image when compute nodes are using docker #140

Merged
merged 6 commits into from May 12, 2015

Projects

None yet

3 participants

@vuntz
Member
vuntz commented Apr 27, 2015

No description provided.

@vuntz vuntz referenced this pull request in SUSE-Cloud/automation Apr 27, 2015
Merged

initial support for docker #303

@jsuchome jsuchome and 1 other commented on an outdated diff Apr 27, 2015
chef/cookbooks/tempest/recipes/config.rb
+kvm_compute_nodes = search(:node, "roles:nova-multi-compute-kvm") || []
+docker_compute_nodes = search(:node, "roles:nova-multi-compute-docker") || []
+
+use_resize = kvm_compute_nodes.length > 1
+use_livemigration = nova[:nova][:use_migration] && kvm_compute_nodes.length > 1
+
+if !docker_compute_nodes.empty? && kvm_compute_nodes.empty?
+ bash "upload tempest test image" do
+ code <<-EOH
+DOCKER_IMAGE_ID=$(glance #{insecure} image-list
+ --name cirros
+ --container-format docker
+ --is-public True
+ --page-size 1
+ 2> /dev/null | tail -n 2 | head -n 1 | awk '{ print $2 }')
+[ -n "$DOCKER_IMAGE_ID" ] && echo $"$DOCKER_IMAGE_ID" > #{docker_image_id_file}
@jsuchome
jsuchome Apr 27, 2015

why $"$DOCKER_IMAGE_ID"?

@vuntz
vuntz Apr 27, 2015 Member

That was a bug :-)

vuntz added some commits Apr 27, 2015
@vuntz vuntz Use docker image when compute nodes are using docker d9bab6e
@vuntz vuntz Disable rescue tests when using docker
Rescue doesn't make sense for docker and won't be implemented, see
http://blog-calfonso.rhcloud.com/?p=84
605633b
@vuntz vuntz Disable interface_attach tests for docker
This is not implemented in the docker driver, so can't work.
76e0e11
@vuntz
Member
vuntz commented Apr 27, 2015

Smoketests are passing with this.

@vuntz
Member
vuntz commented Apr 28, 2015

For the record, we're down to:

Ran 1524 tests in 5523.572s

FAILED (failures=11)

@vuntz vuntz added this to the sprint 19 milestone Apr 28, 2015
@jsuchome

+1 I think current results are quite good

@ovisan
ovisan commented May 12, 2015

👍 cool

@vuntz vuntz merged commit 4c3c6b0 into crowbar:master May 12, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
This was referenced Jul 31, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment