diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-06-01 14:38:27 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-06-01 14:38:27 -0400 |
| commit | c4c6685855a9dc6b4c698465b799c72d6a4f13bd (patch) | |
| tree | 96372201e3dab7e2dd91612bbdec72fcbe84e4e9 /roles/etcd | |
| parent | 54186e0e5022a827e6ffdeaffabcb5403bebe6e6 (diff) | |
| parent | 4b347b84711fdf0906fa3a270f51c38c23fe247e (diff) | |
| download | openshift-c4c6685855a9dc6b4c698465b799c72d6a4f13bd.tar.gz openshift-c4c6685855a9dc6b4c698465b799c72d6a4f13bd.tar.bz2 openshift-c4c6685855a9dc6b4c698465b799c72d6a4f13bd.tar.xz openshift-c4c6685855a9dc6b4c698465b799c72d6a4f13bd.zip | |
Merge pull request #1968 from abutcher/os-firewall-eval
[v2] Move os_firewall_allow from defaults to role dependencies.
Diffstat (limited to 'roles/etcd')
| -rw-r--r-- | roles/etcd/defaults/main.yaml | 6 | ||||
| -rw-r--r-- | roles/etcd/meta/main.yml | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/roles/etcd/defaults/main.yaml b/roles/etcd/defaults/main.yaml index 1cb055816..2ec62c37c 100644 --- a/roles/etcd/defaults/main.yaml +++ b/roles/etcd/defaults/main.yaml @@ -14,9 +14,3 @@ etcd_advertise_client_urls: "{{ etcd_url_scheme }}://{{ etcd_ip }}:{{ etcd_clien etcd_listen_client_urls: "{{ etcd_url_scheme }}://{{ etcd_ip }}:{{ etcd_client_port }}" etcd_data_dir: /var/lib/etcd/ - -os_firewall_allow: -- service: etcd - port: "{{etcd_client_port}}/tcp" -- service: etcd peering - port: "{{ etcd_peer_port }}/tcp" diff --git a/roles/etcd/meta/main.yml b/roles/etcd/meta/main.yml index a71b36237..7156a9fff 100644 --- a/roles/etcd/meta/main.yml +++ b/roles/etcd/meta/main.yml @@ -16,5 +16,10 @@ galaxy_info: - cloud - system dependencies: -- { role: os_firewall } -- { role: etcd_common } +- role: os_firewall + os_firewall_allow: + - service: etcd + port: "{{etcd_client_port}}/tcp" + - service: etcd peering + port: "{{ etcd_peer_port }}/tcp" +- role: etcd_common |