Add support for docker #260

Merged
merged 1 commit into from Apr 10, 2015

Projects

None yet

3 participants

@vuntz
Member
vuntz commented Mar 12, 2015

No description provided.

@vuntz vuntz changed the title from Add suppor for docker to Add support for docker Mar 12, 2015
@tboerger tboerger commented on the diff Mar 16, 2015
...ookbooks/glance/templates/default/glance-api.conf.erb
@@ -81,6 +81,7 @@ workers = <%= [node["cpu"]["total"], 2, 4].sort[1] %>
# Supported values for the 'container_format' image attribute
#container_formats=ami,ari,aki,bare,ovf,ova
+container_formats=ami,ari,aki,bare,ovf,ova<%= @use_docker ? ",docker" : "" %>
@tboerger
tboerger Mar 16, 2015 Contributor

I think it should be nicer to have it as an attribute array and join it within the config, what do you think?

@vuntz
vuntz Apr 3, 2015 Member

For the record, the reason to not use an attribute array is that we want to easily be able to compare the values we don't change (ami,ari,aki,bare,ovf,ova) with what is in the upstream config file.

@tboerger
Contributor

Small nitpic but LGTM

@jsuchome
jsuchome commented Apr 2, 2015

+1, tested and adding docker image to glance works

@vuntz vuntz merged commit 056958b into crowbar:master Apr 10, 2015

1 check passed

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