openstack/tripleo-ci
Code Issues Proposed changes

Update heat agent path for image building

Browse Source 
The heat-agent dib elements should be pulled from the heat-agents
repository and not the heat-templates repo. These agents have been
recently removed from the heat templates repo which has broken the image
building. https://review.openstack.org/#/c/584777/

Change-Id: I5bbf0b7b3c8c69d538f6ad07219a1bdd106a43b1
Closes-Bug: #1810431
This commit is contained in:
Alex Schultz 2019-01-03 10:33:41 -07:00
parent 3d634dc287
commit cf667ebfd8
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/tripleo-buildimage/run-v3.yaml
View File

@ -60,7 +60,7 @@
ELEMENTS="{{ openstack_git_root }}/tripleo-puppet-elements/elements:"
ELEMENTS+="{{ openstack_git_root }}/tripleo-image-elements/elements:"
ELEMENTS+="{{ openstack_git_root }}/heat-templates/hot/software-config/elements"
ELEMENTS+="{{ openstack_git_root }}/heat-agents"
if [ -d "{{ openstack_git_root }}/instack-undercloud/elements" ]; then
ELEMENTS="{{ openstack_git_root }}/instack-undercloud/elements:${ELEMENTS}"

3
playbooks/tripleo-buildimage/run.yaml
View File

@ -30,7 +30,6 @@
--cache-dir /opt/git \
git://git.openstack.org \
openstack/diskimage-builder \
openstack/heat-templates \
openstack/heat-agents \
openstack/instack-undercloud \
openstack/python-tripleoclient \
@ -49,7 +48,7 @@
cd python-tripleoclient
ELEMENTS="$WORKSPACE/tripleo-puppet-elements/elements:"
ELEMENTS+="$WORKSPACE/tripleo-image-elements/elements:"
ELEMENTS+="$WORKSPACE/heat-templates/hot/software-config/elements"
ELEMENTS+="$WORKSPACE/heat-agents"
TOX_ENV=venv
# Basic Deployment (CLI)

3
zuul.d/build-image.yaml
View File

@ -25,7 +25,6 @@
required-projects:
- git.openstack.org/openstack/diskimage-builder
- git.openstack.org/openstack/heat-agents
- git.openstack.org/openstack/heat-templates
- git.openstack.org/openstack/instack-undercloud
- git.openstack.org/openstack/ironic
- git.openstack.org/openstack/ironic-python-agent
@ -53,7 +52,6 @@
required-projects:
- git.openstack.org/openstack/diskimage-builder
- git.openstack.org/openstack/heat-agents
- git.openstack.org/openstack/heat-templates
- git.openstack.org/openstack/instack-undercloud
- git.openstack.org/openstack/python-tripleoclient
- git.openstack.org/openstack/requirements
@ -78,7 +76,6 @@
required-projects:
- git.openstack.org/openstack/diskimage-builder
- git.openstack.org/openstack/heat-agents
- git.openstack.org/openstack/heat-templates
- git.openstack.org/openstack/instack-undercloud
- git.openstack.org/openstack/python-tripleoclient
- git.openstack.org/openstack/tripleo-common