From b124c6a9d9bb5174bd5fe11e2ab8159b220ef794 Mon Sep 17 00:00:00 2001 From: Maciej Delmanowski Date: Tue, 24 Nov 2015 15:25:13 +0100 Subject: [PATCH] Remove 'd([])' from common.yml playbook --- CHANGELOG.rst | 3 +++ playbooks/common.yml | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 74f394b..434af01 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -63,6 +63,9 @@ v0.2.8 You can use :command:`sed --regexp-extended --in-place '/\[debops_service_/! s/^\[debops_(.+)\]$/[debops_service_\1]/' hosts` to update your inventory file. [ypid] +- Remove ``d([])`` from ``common.yml`` playbook to pass the variables correctly + between roles. [drybjed] + v0.2.7 ------ diff --git a/playbooks/common.yml b/playbooks/common.yml index dbc140b..e9e1127 100644 --- a/playbooks/common.yml +++ b/playbooks/common.yml @@ -11,7 +11,7 @@ - role: debops.apt_preferences tags: [ 'apt_preferences', 'role::apt_preferences' ] apt_preferences_dependent_list: - - '{{ sshd_apt_preferences_dependent_list | d([]) }}' + - '{{ sshd_apt_preferences_dependent_list }}' - role: debops.etc_services tags: [ 'role::etc_services' ] @@ -34,13 +34,13 @@ - role: debops.ferm tags: [ 'role::ferm' ] ferm_dependent_rules: - - '{{ (ntp_ferm_dependent_rules | d([])) }}' - - '{{ (sshd_ferm_dependent_rules | d([])) }}' + - '{{ (ntp_ferm_dependent_rules }}' + - '{{ (sshd_ferm_dependent_rules }}' - role: debops.tcpwrappers tags: [ 'role::tcpwrappers' ] tcpwrappers_dependent_allow: - - '{{ sshd_tcpwrappers_dependent_allow | d([]) }}' + - '{{ sshd_tcpwrappers_dependent_allow }}' - role: debops.ntp tags: [ 'role::ntp' ]