wallenstein/algo
1
0
Fork 0
mirror of https://github.com/trailofbits/algo.git synced 2025-08-03 11:23:03 +02:00
Code Issues Projects Releases Wiki Activity

fixed ansible-lint errors

Browse source
This commit is contained in:
milkmix 2019-05-03 17:06:22 +02:00
parent 439501da18
commit f4efa37264
2 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
roles/cloud-cloudstack/tasks/main.yml
View file

@ -3,14 +3,14 @@
- name: Build python virtual environment - name: Build python virtual environment
import_tasks: venv.yml import_tasks: venv.yml
- name: Include prompts
import_tasks: prompts.yml
- block: - block:
- name: Include prompts
import_tasks: prompts.yml
- set_fact: - set_fact:
algo_region: >- algo_region: >-
{% if region is defined %}{{ region }} {% if region is defined %}{{ region }}
{%- elif _algo_region.user_input is defined and _algo_region.user_input != "" %}{{ cs_zones[_algo_region.user_input | int -1 ]['name'] }} {%- elif _algo_region.user_input is defined and _algo_region.user_input | length > 0 %}{{ cs_zones[_algo_region.user_input | int -1 ]['name'] }}
{%- else %}{{ cs_zones[default_zone | int - 1]['name'] }}{% endif %} {%- else %}{{ cs_zones[default_zone | int - 1]['name'] }}{% endif %}
- name: Security group created - name: Security group created
@ -62,7 +62,7 @@
environment: environment:
PYTHONPATH: "{{ cloudstack_venv }}/lib/python2.7/site-packages/" PYTHONPATH: "{{ cloudstack_venv }}/lib/python2.7/site-packages/"
CLOUDSTACK_CONFIG: "{{ _cs_config }}" CLOUDSTACK_CONFIG: "{{ _cs_config }}"
CLOUDSTACK_REGION: "{% if _cs_region.user_input == '' %}{{ 'exoscale' }}{% else %}{{ _cs_region.user_input }}{% endif %}" CLOUDSTACK_REGION: "{% if _cs_region.user_input | length <= 0 %}{{ 'exoscale' }}{% else %}{{ _cs_region.user_input }}{% endif %}"
rescue: rescue:
- debug: var=fail_hint - debug: var=fail_hint

14
roles/cloud-cloudstack/tasks/prompts.yml
View file

@ -1,21 +1,15 @@
--- ---
- block: - block:
- set_fact:
_cs_config: "{{ lookup('env', 'CLOUDSTACK_CONFIG') }}"
- pause: - pause:
prompt: | prompt: |
Enter path for cloudstack.ini file Enter path for cloudstack.ini file
[~/.cloudstack.ini] [~/.cloudstack.ini]
register: _cs_config_input register: _cs_config_input
when: _cs_config == "" when:
- lookup('env', 'CLOUDSTACK_CONFIG') | length <= 0
- set_fact: - set_fact:
_cs_config_input: "{% if _cs_config_input.user_input == ''%}{{ '~/.cloudstack.ini' }}{% else %}{{ _cs_config_input.user_input }}{% endif %}" _cs_config: "{{ _cs_config_input.user_input | default(lookup('env', 'CLOUDSTACK_CONFIG'), true) | default('~/.cloudstack.ini') }}"
when: _cs_config == ""
- set_fact:
_cs_config: "{% if _cs_config == '' %}{{ _cs_config_input }}{% else %}{{ _cs_config }}{% endif %}"
- pause: - pause:
prompt: | prompt: |
@ -26,7 +20,7 @@
- name: Parse zones from output - name: Parse zones from output
set_fact: set_fact:
_cs_zones: "{{ _cloudstack_zones | from_json }}" _cs_zones: "{{ _cloudstack_zones | from_json }}"
- name: Extract zones from output - name: Extract zones from output
set_fact: set_fact:
cs_zones: "{{ _cs_zones | sort(attribute='name') }}" cs_zones: "{{ _cs_zones | sort(attribute='name') }}"