From b82117097cca70b08c2385c861dcdc307558daa7 Mon Sep 17 00:00:00 2001
From: John Trowbridge <trown@redhat.com>
Date: Thu, 10 Sep 2015 10:38:44 -0400
Subject: [PATCH] DIB includes the "in-tree" elements by default

The default provided for --elements-path includes
'/usr/share/diskimage-builder/elements'. However,
diskimage-builder will include this path by default. This
will cause any element with a svc-map to fail with
duplicate svc-map entries.

This patch removes '/usr/share/diskimage-builder/elements'
from the default for --elements-path.

Change-Id: I388b564cb05f8bdb4006ac29df4837738453109a
Closes-Bug: #1494349
---
 tripleoclient/v1/overcloud_image.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tripleoclient/v1/overcloud_image.py b/tripleoclient/v1/overcloud_image.py
index 02cd0db39..8a9ec38be 100644
--- a/tripleoclient/v1/overcloud_image.py
+++ b/tripleoclient/v1/overcloud_image.py
@@ -125,7 +125,6 @@ class BuildOvercloudImage(command.Command):
                     self.TRIPLEOPUPPETELEMENTS,
                     self.INSTACKUNDERCLOUDELEMENTS,
                     '/usr/share/tripleo-image-elements',
-                    '/usr/share/diskimage-builder/elements',
                     '/usr/share/openstack-heat-templates/'
                     'software-config/elements',
                 ])),