Switch the image default to v2

It turns out it's more common than v1. Also, ovh was inappropriately
listing glance v1.

Change-Id: Icb534bf98fd3fa1c900ed9e4dd09ea0643176ff9

8 files changed, 4 insertions, 15 deletions

diff --git a/doc/source/vendor-support.rst b/doc/source/vendor-support.rst
index 58207a7..b8ececb 100644
--- a/doc/source/vendor-support.rst
+++ b/doc/source/vendor-support.rst
@@ -15,7 +15,7 @@ These are the default behaviors unless a cloud is configured differently.
 
 * Identity uses `password` authentication
 * Identity API Version is 2
-* Image API Version is 1
+* Image API Version is 2
 * Images must be in `qcow2` format
 * Images are uploaded using PUT interface
 * Public IPv4 is directly routable via DHCP from Neutron
@@ -37,6 +37,7 @@ region-b.geo-1 US East
 ============== ================
 
 * DNS Service Type is `hpext:dns`
+* Image API Version is 1
 * Public IPv4 is provided via NAT with Neutron Floating IP
 
 rackspace
@@ -56,7 +57,6 @@ HKG            Hong Kong
 
 * Database Service Type is `rax:database`
 * Compute Service Name is `cloudServersOpenStack`
-* Image API Version is 2
 * Images must be in `vhd` format
 * Images must be uploaded using the Glance Task Interface
 * Floating IPs are not needed
@@ -78,7 +78,6 @@ Region Name    Human Name
 RegionOne      Region One
 ============== ================
 
-* Image API Version is 2
 * Images must be in `raw` format
 * Public IPv4 is provided via NAT with Neutron Floating IP
 * IPv6 is provided to every server
@@ -94,8 +93,6 @@ Region Name    Human Name
 ca-ymq-1       Montreal
 ============== ================
 
-* Image API Version is 2
-
 runabove
 --------
 
@@ -108,7 +105,6 @@ SBG-1          Strassbourg, FR
 BHS-1          Beauharnois, QC
 ============== ================
 
-* Image API Version is 2
 * Floating IPs are not supported
 
 unitedstack
@@ -124,7 +120,6 @@ gd1            Guangdong
 ============== ================
 
 * Identity API Version is 3
-* Image API Version is 2
 * Images must be in `raw` format
 
 auro
@@ -139,7 +134,6 @@ van1           Vancouver, BC
 ============== ================
 
 * Public IPv4 is provided via NAT with Nova Floating IP
-* Image API Version is 2
 * Floating IPs are provided by Nova
 * Security groups are provided by Nova
 
@@ -172,5 +166,4 @@ Kna1           Karlskrona, SE
 ============== ================
 
 * Identity API Version is 3
-* Image API Version is 2
 * Public IPv4 is provided via NAT with Neutron Floating IP
diff --git a/os_client_config/defaults.yaml b/os_client_config/defaults.yaml
index abc75ca..e81eb16 100644
--- a/os_client_config/defaults.yaml
+++ b/os_client_config/defaults.yaml
@@ -8,7 +8,7 @@ interface: public
 floating_ip_source: neutron
 identity_api_version: '2'
 image_api_use_tasks: false
-image_api_version: '1'
+image_api_version: '2'
 image_format: qcow2
 network_api_version: '2'
 object_api_version: '1'
diff --git a/os_client_config/vendors/dreamhost.yaml b/os_client_config/vendors/dreamhost.yaml
index 5e10d14..3cd395a 100644
--- a/os_client_config/vendors/dreamhost.yaml
+++ b/os_client_config/vendors/dreamhost.yaml
@@ -3,5 +3,4 @@ profile:
   auth:
     auth_url: https://keystone.dream.io/v2.0
   region_name: RegionOne
-  image_api_version: '2'
   image_format: raw
diff --git a/os_client_config/vendors/hp.yaml b/os_client_config/vendors/hp.yaml
index 4da4956..a0544df 100644
--- a/os_client_config/vendors/hp.yaml
+++ b/os_client_config/vendors/hp.yaml
@@ -6,3 +6,4 @@ profile:
   - region-a.geo-1
   - region-b.geo-1
   dns_service_type: hpext:dns
+  image_api_version: '1'
diff --git a/os_client_config/vendors/rackspace.yaml b/os_client_config/vendors/rackspace.yaml
index ad7825d..5cf7a44 100644
--- a/os_client_config/vendors/rackspace.yaml
+++ b/os_client_config/vendors/rackspace.yaml
@@ -10,7 +10,6 @@ profile:
   - SYD
   database_service_type: rax:database
   compute_service_name: cloudServersOpenStack
-  image_api_version: '2'
   image_api_use_tasks: true
   image_format: vhd
   floating_ip_source: None
diff --git a/os_client_config/vendors/runabove.yaml b/os_client_config/vendors/runabove.yaml
index 57e75f3..3452894 100644
--- a/os_client_config/vendors/runabove.yaml
+++ b/os_client_config/vendors/runabove.yaml
@@ -5,6 +5,5 @@ profile:
   regions:
   - BHS-1
   - SBG-1
-  image_api_version: '2'
   image_format: qcow2
   floating_ip_source: None
diff --git a/os_client_config/vendors/unitedstack.yaml b/os_client_config/vendors/unitedstack.yaml
index f22bd8a..c6d5cc2 100644
--- a/os_client_config/vendors/unitedstack.yaml
+++ b/os_client_config/vendors/unitedstack.yaml
@@ -6,6 +6,5 @@ profile:
   - bj1
   - gd1
   identity_api_version: '3'
-  image_api_version: '2'
   image_format: raw
   floating_ip_source: None
diff --git a/os_client_config/vendors/vexxhost.yaml b/os_client_config/vendors/vexxhost.yaml
index f67c644..4a0ba27 100644
--- a/os_client_config/vendors/vexxhost.yaml
+++ b/os_client_config/vendors/vexxhost.yaml
@@ -3,5 +3,4 @@ profile:
   auth:
     auth_url: http://auth.api.thenebulacloud.com:5000/v2.0/
   region_name: ca-ymq-1
-  image_api_version: '2'
   floating_ip_source: None