Fix Kayobe overcloud introspection data save

Kayobe overcloud introspection data save fails because the dynamic
inventory script siliently breaks causing Ansible to parse it as a
static inventory file. The failure occurs due to OS_TOKEN being set.
This change works around setting OS_TOKEN before running the dynamic
inventory script by setting OS_CLOUD before querying inspector.

Confirmed on Stein and Train, and verified in both environments.

Story: 2007326
Task: 38846
Change-Id: I57fbf91ae3440d3e4e6a64cd7d05151e299c9322
This commit is contained in:
Doug Szumski 2020-02-21 15:43:46 +00:00
parent 3de40b57ba
commit 167e2ff3db
2 changed files with 7 additions and 2 deletions

View File

@ -13,7 +13,6 @@
command: > command: >
docker exec bifrost_deploy docker exec bifrost_deploy
bash -c ' bash -c '
export OS_TOKEN=fake-token &&
export BIFROST_INVENTORY_SOURCE=ironic && export BIFROST_INVENTORY_SOURCE=ironic &&
ansible baremetal ansible baremetal
--connection local --connection local
@ -22,7 +21,7 @@
-e @/etc/bifrost/dib.yml -e @/etc/bifrost/dib.yml
--limit {{ inventory_hostname }} --limit {{ inventory_hostname }}
-m shell -m shell
-a "env OS_URL=http://localhost:5050 openstack baremetal introspection data save {% raw %}{{ inventory_hostname }}{% endraw %}"' -a "env OS_CLOUD=bifrost-inspector openstack baremetal introspection data save {% raw %}{{ inventory_hostname }}{% endraw %}"'
register: save_result register: save_result
changed_when: False changed_when: False
# Ignore errors, log a message later. # Ignore errors, log a message later.

View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes a bug where introspection data save would fail.
See `Story 2007326 <https://storyboard.openstack.org/#!/story/2007326>`_
for more details.