openstack/openstack-ansible
Code Issues Proposed changes

Merge "Remove jinja2 delimiters in when"

Browse Source
This commit is contained in:
Zuul 2017-11-30 12:55:47 +00:00 committed by Gerrit Code Review
commit d784bea5ec
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/galera-install.yml
View File

@ -51,12 +51,12 @@
- role: haproxy_endpoints - role: haproxy_endpoints
haproxy_state: disabled haproxy_state: disabled
static: no static: no
when: "{{ groups['haproxy'] | default([]) | length > 0 }}" when: "groups['haproxy'] | default([]) | length > 0"
- role: "galera_server" - role: "galera_server"
- role: haproxy_endpoints - role: haproxy_endpoints
haproxy_state: enabled haproxy_state: enabled
static: no static: no
when: "{{ groups['haproxy'] | default([]) | length > 0 }}" when: "groups['haproxy'] | default([]) | length > 0"
- role: "rsyslog_client" - role: "rsyslog_client"
rsyslog_client_log_rotate_file: galera_log_rotate rsyslog_client_log_rotate_file: galera_log_rotate
rsyslog_client_log_dir: "/var/log/mysql_logs" rsyslog_client_log_dir: "/var/log/mysql_logs"

4
playbooks/os-keystone-install.yml
View File

@ -77,7 +77,7 @@
vars: vars:
haproxy_backend: "{{ item }}" haproxy_backend: "{{ item }}"
haproxy_state: disabled haproxy_state: disabled
when: "{{ groups['keystone_all'] | length > 1 }}" when: "groups['keystone_all'] | length > 1"
with_items: with_items:
- "keystone_service-back" - "keystone_service-back"
- "keystone_admin-back" - "keystone_admin-back"
@ -142,7 +142,7 @@
vars: vars:
haproxy_backend: "{{ item }}" haproxy_backend: "{{ item }}"
haproxy_state: enabled haproxy_state: enabled
when: "{{ groups['keystone_all'] | length > 1 }}" when: "groups['keystone_all'] | length > 1"
with_items: with_items:
- "keystone_service-back" - "keystone_service-back"
- "keystone_admin-back" - "keystone_admin-back"

2
tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
View File

@ -192,7 +192,7 @@
with_items: with_items:
- /etc/openstack_deploy/group_vars - /etc/openstack_deploy/group_vars
- /etc/openstack_deploy/host_vars - /etc/openstack_deploy/host_vars
when: "{{ (lookup('env','ACTION') | default(false,true)) == 'varstest' }}" when: "(lookup('env','ACTION') | default(false,true)) == 'varstest'"
- name: Create user-space overrides - name: Create user-space overrides
lineinfile: lineinfile: