From 27d342335d576706122117e6fcf65b2c43ca0ce4 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mar 13 2016 16:24:19 +0000
Subject: better subvariants for cloud images


Vagrant is an imagetype, it's not properly a component of the
subvariant; both the raw disk and vagrant cloud_base images
should have the same subvariant.

The Docker image's subvariant should be Docker_Base to stay in
line with the Cloud images, I think.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/fedora.conf b/fedora.conf
index 14ce066..4c996db 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -290,7 +290,7 @@ image_build = {
                     'arches': ['x86_64'],
                     'repo_from': 'Cloud',
                     'install_tree_from': 'Cloud',
-                    'subvariant': 'Docker'
+                    'subvariant': 'Docker_Base'
                     }
         }
         ],
@@ -326,7 +326,7 @@ image_build = {
                     'arches': ['x86_64', 'i386'],
                     'repo_from': 'Cloud',
                     'install_tree_from': 'Cloud',
-                    'subvariant': 'Cloud_Base-Vagrant'
+                    'subvariant': 'Cloud_Base'
                      }
         }
         ],