Merge ~aym-frikha/charm-elasticsearch:bug-1748433 into ~elasticsearch-charmers/charm-elasticsearch:master

Proposed by Aymen Frikha
Status: Merged
Approved by: Paul Collins
Approved revision: 7fb47b7f9116a690768cfa510f0186d23458430d
Merged at revision: 3b147f5fc1e28925882e60542761182072c04caa
Proposed branch: ~aym-frikha/charm-elasticsearch:bug-1748433
Merge into: ~elasticsearch-charmers/charm-elasticsearch:master
Diff against target: 47 lines (+4/-3)
3 files modified
hooks/charmhelpers/contrib/ansible/__init__.py (+1/-1)
metadata.yaml (+1/-0)
tasks/setup-ufw.yml (+2/-2)
Reviewer Review Type Date Requested Status
Paul Collins lgtm Approve
Tom Haddon Approve
Jacek Nykis (community) Needs Information
Review via email: mp+345476@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jacek Nykis (jacekn) wrote :

Changes seem fine but can you confirm they are backwards compatible?

review: Needs Information
Revision history for this message
Tom Haddon (mthaddon) wrote :
review: Approve
Revision history for this message
Paul Collins (pjdc) :
review: Approve (lgtm)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hooks/charmhelpers/contrib/ansible/__init__.py b/hooks/charmhelpers/contrib/ansible/__init__.py
2index f3617db..5281946 100644
3--- a/hooks/charmhelpers/contrib/ansible/__init__.py
4+++ b/hooks/charmhelpers/contrib/ansible/__init__.py
5@@ -134,7 +134,7 @@ def install_ansible_support(from_ppa=True, ppa_location='ppa:rquillo/ansible'):
6 charmhelpers.fetch.apt_update(fatal=True)
7 charmhelpers.fetch.apt_install('ansible')
8 with open(ansible_hosts_path, 'w+') as hosts_file:
9- hosts_file.write('localhost ansible_connection=local')
10+ hosts_file.write('localhost ansible_connection=local ansible_remote_tmp=/root/.ansible/tmp')
11
12
13 def apply_playbook(playbook, tags=None, extra_vars=None):
14diff --git a/metadata.yaml b/metadata.yaml
15index 4701b93..5906e80 100644
16--- a/metadata.yaml
17+++ b/metadata.yaml
18@@ -8,6 +8,7 @@ tags:
19 - misc
20 subordinate: false
21 series:
22+ - bionic
23 - xenial
24 - trusty
25 peers:
26diff --git a/tasks/setup-ufw.yml b/tasks/setup-ufw.yml
27index bc074c0..e7d5f1f 100644
28--- a/tasks/setup-ufw.yml
29+++ b/tasks/setup-ufw.yml
30@@ -28,7 +28,7 @@
31
32 - name: Open the firewall for all clients
33 ufw: rule=allow src={{ lookup('dns', item['private-address']) }} port=9200 proto=tcp
34- with_items: relations["client"]
35+ with_items: "{{ relations['client'] }}"
36 when: firewall_enabled
37
38 - name: Deny all other requests on 9200
39@@ -37,7 +37,7 @@
40
41 - name: Open the firewall for all peers
42 ufw: rule=allow src={{ lookup('dns', item['private-address']) }} port=9300 proto=tcp
43- with_items: relations["peer"]
44+ with_items: "{{ relations['peer'] }}"
45 when: firewall_enabled
46
47 # Only deny incoming on 9300 once the unit is part of a cluster.

Subscribers

People subscribed via source and target branches