Merge "Prefix install_openstacksdk variable"
This commit is contained in:
commit
78f802715e
playbooks
@ -13,8 +13,8 @@
|
||||
- role: install-ansible
|
||||
install_ansible_name: '{{ bridge_ansible_name | default("ansible") }}'
|
||||
install_ansible_version: '{{ bridge_ansible_version | default("2.7.3") }}'
|
||||
install_openstacksdk_name: '{{ bridge_openstacksdk_name | default("openstacksdk") }}'
|
||||
install_openstacksdk_version: '{{ bridge_openstacksdk_verison | default("latest") }}'
|
||||
install_ansible_openstacksdk_name: '{{ bridge_openstacksdk_name | default("openstacksdk") }}'
|
||||
install_ansible_openstacksdk_version: '{{ bridge_openstacksdk_verison | default("latest") }}'
|
||||
- root-keys
|
||||
- ansible-cron
|
||||
- cloud-launcher-cron
|
||||
|
@ -20,7 +20,7 @@ Install and configure Ansible on a host via pip
|
||||
value "latest" will ensure ``state: latest`` is set for the
|
||||
package and thus the latest version is always installed.
|
||||
|
||||
.. zuul:rolevar:: install_openstacksdk_name
|
||||
.. zuul:rolevar:: install_ansible_openstacksdk_name
|
||||
:default: openstacksdk
|
||||
|
||||
The name of the openstacksdk package to install. To install from
|
||||
@ -28,12 +28,12 @@ Install and configure Ansible on a host via pip
|
||||
e.g. to install from a gerrit change
|
||||
``git+https://git.openstack.org/openstack/openstacksdk@refs/changes/12/3456/1#egg=openstacksdk``
|
||||
|
||||
.. zuul:rolevar:: install_openstacksdk_version
|
||||
.. zuul:rolevar:: install_ansible_openstacksdk_version
|
||||
:default: latest
|
||||
|
||||
The version of the library from
|
||||
:zuul:rolevar:`install-ansible.install_openstacksdk_name`. Set
|
||||
:zuul:rolevar:`install-ansible.install_ansible_openstacksdk_name`. Set
|
||||
this to empty (YAML ``null``) if specifying versions via
|
||||
:zuul:rolevar:`install-ansible.install_openstacksdk_name`. The
|
||||
:zuul:rolevar:`install-ansible.install_ansible_openstacksdk_name`. The
|
||||
special value "latest" will ensure ``state: latest`` is set for the
|
||||
package and thus the latest version is always installed.
|
||||
|
@ -29,23 +29,23 @@
|
||||
# openstacksdk
|
||||
- name: Set openstacksdk default version to latest
|
||||
set_fact:
|
||||
install_openstacksdk_version: latest
|
||||
when: install_openstacksdk_version is not defined
|
||||
install_ansible_openstacksdk_version: latest
|
||||
when: install_ansible_openstacksdk_version is not defined
|
||||
|
||||
- name: Set openstacksdk version for installation
|
||||
set_fact:
|
||||
_install_openstacksdk_version: '{{ install_openstacksdk_version }}'
|
||||
when: install_openstacksdk_version not in ('', 'latest')
|
||||
_install_ansible_openstacksdk_version: '{{ install_ansible_openstacksdk_version }}'
|
||||
when: install_ansible_openstacksdk_version not in ('', 'latest')
|
||||
|
||||
- name: Set openstacksdk package state for installation
|
||||
set_fact:
|
||||
_install_openstacksdk_state: latest
|
||||
when: install_openstacksdk_version == 'latest'
|
||||
when: install_ansible_openstacksdk_version == 'latest'
|
||||
|
||||
- name: Install openstacksdk
|
||||
pip:
|
||||
name: '{{ install_openstacksdk_name | default("openstacksdk") }}'
|
||||
version: '{{ _install_openstacksdk_version | default(omit) }}'
|
||||
name: '{{ install_ansible_openstacksdk_name | default("openstacksdk") }}'
|
||||
version: '{{ _install_ansible_openstacksdk_version | default(omit) }}'
|
||||
state: '{{ _install_openstacksdk_state | default(omit) }}'
|
||||
|
||||
- name: Ensure /etc/ansible and /etc/ansible/hosts
|
||||
|
Loading…
x
Reference in New Issue
Block a user