Fix kayobe baremetal compute commands

Since adding support for Python 3, the following commands fail:

* kayobe baremetal compute inspect
* kayobe baremetal compute manage
* kayobe baremetal compute provide

There are two issues:

1. There is a missing /bin from the ansible_python_interpreter path used.

2. The stackhpc.os-ironic-nodes role fails with an undefined variable:

    name 'openstack_cloud_from_module' is not defined

This is fixed in the stackhpc.os-ironic-nodes role version 1.3.1.

Story: 2007797
Task: 40051

Change-Id: Ie2a0a6bf75dc88458796a9691891e76f578d87ad
This commit is contained in:
Mark Goddard 2020-06-11 17:48:49 +01:00
parent e75b4a7854
commit 08c5d00a61
5 changed files with 16 additions and 5 deletions

View File

@ -24,7 +24,7 @@
vars:
controller_host: "{{ groups['controllers'][0] }}"
venv: "{{ virtualenv_path }}/openstacksdk"
ansible_python_interpreter: "{{ venv }}/python"
ansible_python_interpreter: "{{ venv }}/bin/python"
# Whether to wait for the state transition to complete.
baremetal_compute_wait: True
# Time to wait for state transition to complete, if baremetal_compute_wait

View File

@ -6,7 +6,7 @@
# We install openstacksdk in a virtualenv on one of the controllers, and delegate to
# it when executing the stackhpc.os-ironic-state role.
- name: Ensure baremetal compute nodes are available in ironic
- name: Ensure baremetal compute nodes are manageable in ironic
hosts: controllers[0]
gather_facts: true
vars:
@ -23,7 +23,7 @@
gather_facts: False
vars:
venv: "{{ virtualenv_path }}/openstacksdk"
ansible_python_interpreter: "{{ venv }}/python"
ansible_python_interpreter: "{{ venv }}/bin/python"
# Whether to wait for the state transition to complete.
baremetal_compute_wait: True
# Time to wait for state transition to complete, if baremetal_compute_wait

View File

@ -23,7 +23,7 @@
gather_facts: False
vars:
venv: "{{ virtualenv_path }}/openstacksdk"
ansible_python_interpreter: "{{ venv }}/python"
ansible_python_interpreter: "{{ venv }}/bin/python"
# Whether to wait for the state transition to complete.
baremetal_compute_wait: True
# Time to wait for state transition to complete, if baremetal_compute_wait

View File

@ -0,0 +1,11 @@
---
fixes:
- |
Fixes issues running the following commands:
- ``kayobe baremetal compute inspect``
- ``kayobe baremetal compute manage``
- ``kayobe baremetal compute provide``
See `story 2007797 <https://storyboard.openstack.org/#!/story/2007797>`__
for details.

View File

@ -32,7 +32,7 @@
- src: stackhpc.os-images
version: v1.9.0
- src: stackhpc.os-ironic-state
version: v1.3.0
version: v1.3.1
- src: stackhpc.os-networks
version: v1.4.0
- src: stackhpc.os-openstackclient