From 10a4f9d9d4f5d1a83c2ec3dc162552fe67a092b5 Mon Sep 17 00:00:00 2001 From: hhoucem Date: Thu, 13 Sep 2018 09:34:47 +0200 Subject: [PATCH 1/4] using items instead of iteritems in the Jinja templates --- templates/home/user/.aws/config.j2 | 6 +++--- templates/home/user/.aws/credentials.j2 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/home/user/.aws/config.j2 b/templates/home/user/.aws/config.j2 index 18e5fbd..f3b6645 100644 --- a/templates/home/user/.aws/config.j2 +++ b/templates/home/user/.aws/config.j2 @@ -1,16 +1,16 @@ # {{ ansible_managed }} {% if item.value['configuration'] is defined %} -{% for profile, config in item.value['configuration'].iteritems() | sort %} +{% for profile, config in item.value['configuration'].items() | sort %} {% if profile == 'default' %} [{{ profile }}] {% else %} [profile {{ profile }}] {% endif %} -{% for parameter, value in awscli_configuration[ config ].iteritems() | sort %} +{% for parameter, value in awscli_configuration[ config ].items() | sort %} {% if value is mapping %} {{ parameter }} = -{% for nested_parameter, nested_value in value.iteritems() | sort %} +{% for nested_parameter, nested_value in value.items() | sort %} {{ nested_parameter }} = {{ nested_value }} {% endfor %} {% else %} diff --git a/templates/home/user/.aws/credentials.j2 b/templates/home/user/.aws/credentials.j2 index 035e7b5..05a64d9 100644 --- a/templates/home/user/.aws/credentials.j2 +++ b/templates/home/user/.aws/credentials.j2 @@ -3,7 +3,7 @@ {% for profile in item.value['profiles'] %} [{{ profile }}] -{% for parameter, value in awscli_profiles[ profile ].iteritems() | sort %} +{% for parameter, value in awscli_profiles[ profile ].items() | sort %} {{ parameter }}={{ value }} {% endfor %} {% endfor %} From 46b697df1b379ab1659896ac38138ed9e86fb89b Mon Sep 17 00:00:00 2001 From: hhoucem Date: Thu, 13 Sep 2018 09:44:48 +0200 Subject: [PATCH 2/4] remove not needed tasks from daily run --- tasks/main.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 8dec726..ba61557 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -6,13 +6,18 @@ - include: debug.yml when: debug | default(false) - tags: debug + tags: + - debug + - never - include: validation.yml - tags: validation + tags: + - validation + - never - include: installation.yml - tags: installation - + tags: + - installation + - never - include: configuration.yml tags: configuration From 1b99603e0e77027674b26bf2c3dc424ff2fbd459 Mon Sep 17 00:00:00 2001 From: hhoucem Date: Thu, 13 Sep 2018 11:00:00 +0200 Subject: [PATCH 3/4] remove dependency to pip role --- requirements.yml | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 requirements.yml diff --git a/requirements.yml b/requirements.yml deleted file mode 100644 index 8377471..0000000 --- a/requirements.yml +++ /dev/null @@ -1,2 +0,0 @@ -- src: ansiblebit.pip - version: 2.19.6 From 65706181297128ab98fa113790f17a463dedc05b Mon Sep 17 00:00:00 2001 From: hhoucem Date: Thu, 13 Sep 2018 11:00:56 +0200 Subject: [PATCH 4/4] remove dependency for pip role --- meta/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index 966e954..409ec1a 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -18,6 +18,4 @@ galaxy_info: - amazon - cloud - aws - - s3 -dependencies: - - ansiblebit.pip + - s3 \ No newline at end of file