opendev/system-config
Code Issues Proposed changes

Merge "Prefix install_openstacksdk variable"

Browse Source
This commit is contained in:
Zuul 2018-12-12 23:18:58 +00:00 committed by Gerrit Code Review
commit 78f802715e
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/bridge.yaml
View File

@ -13,8 +13,8 @@
- role: install-ansible - role: install-ansible
install_ansible_name: '{{ bridge_ansible_name | default("ansible") }}' install_ansible_name: '{{ bridge_ansible_name | default("ansible") }}'
install_ansible_version: '{{ bridge_ansible_version | default("2.7.3") }}' install_ansible_version: '{{ bridge_ansible_version | default("2.7.3") }}'
install_openstacksdk_name: '{{ bridge_openstacksdk_name | default("openstacksdk") }}' install_ansible_openstacksdk_name: '{{ bridge_openstacksdk_name | default("openstacksdk") }}'
install_openstacksdk_version: '{{ bridge_openstacksdk_verison | default("latest") }}' install_ansible_openstacksdk_version: '{{ bridge_openstacksdk_verison | default("latest") }}'
- root-keys - root-keys
- ansible-cron - ansible-cron
- cloud-launcher-cron - cloud-launcher-cron

8
playbooks/roles/install-ansible/README.rst
View File

@ -20,7 +20,7 @@ Install and configure Ansible on a host via pip
value "latest" will ensure ``state: latest`` is set for the value "latest" will ensure ``state: latest`` is set for the
package and thus the latest version is always installed. package and thus the latest version is always installed.
.. zuul:rolevar:: install_openstacksdk_name .. zuul:rolevar:: install_ansible_openstacksdk_name
:default: openstacksdk :default: openstacksdk
The name of the openstacksdk package to install. To install from 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 e.g. to install from a gerrit change
``git+https://git.openstack.org/openstack/openstacksdk@refs/changes/12/3456/1#egg=openstacksdk`` ``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 :default: latest
The version of the library from 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 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 special value "latest" will ensure ``state: latest`` is set for the
package and thus the latest version is always installed. package and thus the latest version is always installed.

14
playbooks/roles/install-ansible/tasks/main.yaml
View File

@ -29,23 +29,23 @@
# openstacksdk # openstacksdk
- name: Set openstacksdk default version to latest - name: Set openstacksdk default version to latest
set_fact: set_fact:
install_openstacksdk_version: latest install_ansible_openstacksdk_version: latest
when: install_openstacksdk_version is not defined when: install_ansible_openstacksdk_version is not defined
- name: Set openstacksdk version for installation - name: Set openstacksdk version for installation
set_fact: set_fact:
_install_openstacksdk_version: '{{ install_openstacksdk_version }}' _install_ansible_openstacksdk_version: '{{ install_ansible_openstacksdk_version }}'
when: install_openstacksdk_version not in ('', 'latest') when: install_ansible_openstacksdk_version not in ('', 'latest')
- name: Set openstacksdk package state for installation - name: Set openstacksdk package state for installation
set_fact: set_fact:
_install_openstacksdk_state: latest _install_openstacksdk_state: latest
when: install_openstacksdk_version == 'latest' when: install_ansible_openstacksdk_version == 'latest'
- name: Install openstacksdk - name: Install openstacksdk
pip: pip:
name: '{{ install_openstacksdk_name | default("openstacksdk") }}' name: '{{ install_ansible_openstacksdk_name | default("openstacksdk") }}'
version: '{{ _install_openstacksdk_version | default(omit) }}' version: '{{ _install_ansible_openstacksdk_version | default(omit) }}'
state: '{{ _install_openstacksdk_state | default(omit) }}' state: '{{ _install_openstacksdk_state | default(omit) }}'
- name: Ensure /etc/ansible and /etc/ansible/hosts - name: Ensure /etc/ansible and /etc/ansible/hosts