openstack/bifrost
Code Issues Proposed changes

Add keystone to git contents download

Browse Source 
Somewhere along the way we lost, or never had, retrieval of
keystone from git. Now that the keystone patches have landed,
we need to make sure the test script actually works on a blank
machine.

Change-Id: If57b9069d8e2b74011ae038489afaee435584f9f
This commit is contained in:
Julia Kreger 2016-12-05 21:41:39 +00:00
parent c7adb13973
commit a493cc923e
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
playbooks/roles/bifrost-prep-for-install/defaults/main.yml
View File

@ -10,6 +10,7 @@ ironicinspector_git_url: https://github.com/openstack/ironic-inspector
ironicinspectorclient_git_url: https://github.com/openstack/python-ironic-inspector-client
reqs_git_url: https://git.openstack.org/openstack/requirements
staging_drivers_git_url: https://git.openstack.org/openstack/ironic-staging-drivers
keystone_git_url: https://git.openstack.org/openstack/keystone
# *_git_folder can be overridden by local clones for offline installs
ironicclient_git_folder: "{{ git_root}}/python-ironicclient"
ironic_git_folder: "{{ git_root}}/ironic"
@ -19,6 +20,7 @@ shade_git_folder: "{{ git_root}}/shade"
dib_git_folder: "{{ git_root }}/diskimage-builder"
reqs_git_folder: "{{ git_root }}/requirements"
staging_drivers_git_folder: "{{ git_root }}/ironic-staging-drivers"
keystone_git_folder: "{{ git_root}}/keystone"
# *_git_branch can be overridden for stable branch testing
ironicclient_git_branch: master
ironic_git_branch: master
@ -28,6 +30,7 @@ ironicinspector_git_branch: master
ironicinspectorclient_git_branch: master
reqs_git_branch: master
staging_drivers_git_branch: master
keystone_git_branch: master
# Conditional variables utilized based on CI or manual testing options.
copy_from_local_path: false
@ -66,3 +69,7 @@ bifrost_install_sources:
git_url: "{{ staging_drivers_git_url }}"
git_branch: "{{ staging_drivers_git_branch }}"
name: ironic-staging-drivers
- git_folder: "{{ keystone_git_folder }}"
git_url: "{{ keystone_git_url }}"
git_branch: "{{ keystone_git_branch }}"
name: keystone

1
playbooks/test-bifrost-dhcp.yaml
View File

@ -41,6 +41,7 @@
dib_git_url: "/opt/git/openstack/diskimage-builder"
ironicinspector_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/ironic-inspector"
ironicinspectorclient_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/python-ironic-inspector-client"
keystone_git_url: https://git.openstack.org/openstack/keystone
reqs_git_url: "/opt/git/openstack/requirements"
# TODO(TheJulia) Fix the above paths to be consistent, because the NV job gets the dib
# folder cloned, while the gate job does not. Likely need to work out a semi-hybrid

1
playbooks/test-bifrost-dynamic.yaml
View File

@ -23,6 +23,7 @@
dib_git_url: "/opt/git/openstack/diskimage-builder"
ironicinspector_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/ironic-inspector"
ironicinspectorclient_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/python-ironic-inspector-client"
keystone_git_url: https://git.openstack.org/openstack/keystone
reqs_git_url: "/opt/git/openstack/requirements"
staging_drivers_git_url: "/opt/git/openstack/ironic-staging-drivers"
# TODO(TheJulia) Fix the above paths to be consistent, because the NV job gets the dib

1
playbooks/test-bifrost.yaml
View File

@ -35,6 +35,7 @@
dib_git_url: "/opt/git/openstack/diskimage-builder"
ironicinspector_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/ironic-inspector"
ironicinspectorclient_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/python-ironic-inspector-client"
keystone_git_url: "/opt/git/openstack/keystone"
reqs_git_url: "/opt/git/openstack/requirements"
staging_drivers_git_url: "/opt/git/openstack/ironic-staging-drivers"
# TODO(TheJulia) Fix the above paths to be consistent, because the NV job gets the dib