openstack/python-tripleoclient
Code Issues Proposed changes

DIB includes the "in-tree" elements by default

Browse Source 
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
This commit is contained in:
John Trowbridge 2015-09-10 10:38:44 -04:00
parent 12edde8a53
commit b82117097c
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tripleoclient/v1/overcloud_image.py
View File

@ -125,7 +125,6 @@ class BuildOvercloudImage(command.Command):
self.TRIPLEOPUPPETELEMENTS, self.TRIPLEOPUPPETELEMENTS,
self.INSTACKUNDERCLOUDELEMENTS, self.INSTACKUNDERCLOUDELEMENTS,
'/usr/share/tripleo-image-elements', '/usr/share/tripleo-image-elements',
'/usr/share/diskimage-builder/elements',
'/usr/share/openstack-heat-templates/' '/usr/share/openstack-heat-templates/'
'software-config/elements', 'software-config/elements',
])), ])),