From 321e74aca49a371cc9c10dfd222635da84febf0d Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 19 Oct 2016 14:41:27 -0700
Subject: [PATCH] Force entercloud to use glance v1

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

Change-Id: I5840ace6f7be5a255d8a66369179c847a05cefff
---
 modules/openstack_project/templates/nodepool/clouds.yaml.erb     | 1 +
 .../openstack_project/templates/puppetmaster/all-clouds.yaml.erb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
index 6250f5035a..848bb3af10 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -163,6 +163,7 @@ clouds:
       - de-fra1
       - it-mil1
     profile: entercloudsuite
+    image_api_version: '1'
     auth:
       username: '<%= @entercloud_username %>'
       password: '<%= @entercloud_password %>'
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index 8fab9754ce..3eaaf9589b 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -335,6 +335,7 @@ clouds:
       - de-fra1
       - it-mil1
     profile: entercloudsuite
+    image_api_version: '1'
     auth:
       username: <%= @puppetmaster_clouds['openstackzuul_entercloud_username'] %>
       password: <%= @puppetmaster_clouds['openstackzuul_entercloud_password'] %>