Merge "DIB includes the "in-tree" elements by default"

This commit is contained in:
Jenkins 2015-09-17 15:46:08 +00:00 committed by Gerrit Code Review
commit a55e731048

View File

@ -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',
])),