opendev/system-config
Code Issues Proposed changes

Force entercloud to use glance v1

Browse Source 
Much testing with v2 results in failures but forcing glance v1 allows
image uploads to succeed in entercloud so use v1.

Change-Id: I5840ace6f7be5a255d8a66369179c847a05cefff
This commit is contained in:
Clark Boylan 2016-10-19 14:41:27 -07:00
parent b30792bde4
commit 321e74aca4
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/openstack_project/templates/nodepool/clouds.yaml.erb
View File

@ -163,6 +163,7 @@ clouds:
- de-fra1 - de-fra1
- it-mil1 - it-mil1
profile: entercloudsuite profile: entercloudsuite
image_api_version: '1'
auth: auth:
username: '<%= @entercloud_username %>' username: '<%= @entercloud_username %>'
password: '<%= @entercloud_password %>' password: '<%= @entercloud_password %>'

1
modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
View File

@ -335,6 +335,7 @@ clouds:
- de-fra1 - de-fra1
- it-mil1 - it-mil1
profile: entercloudsuite profile: entercloudsuite
image_api_version: '1'
auth: auth:
username: <%= @puppetmaster_clouds['openstackzuul_entercloud_username'] %> username: <%= @puppetmaster_clouds['openstackzuul_entercloud_username'] %>
password: <%= @puppetmaster_clouds['openstackzuul_entercloud_password'] %> password: <%= @puppetmaster_clouds['openstackzuul_entercloud_password'] %>