diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-06 08:48:05 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-06 08:48:05 -0300 |
| commit | 81cb935e1817df4c633397680e963d635ed42e26 (patch) | |
| tree | dd595fab3ae4cc8f5d47dcc2297ff34def6f571c /roles/etcd | |
| parent | 0514bdffca4e06144f4f81db037490d2c0fede40 (diff) | |
| parent | 6fb6e059dc50fcdc2480c06cfcf0a45674283725 (diff) | |
| download | openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.gz openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.bz2 openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.xz openshift-81cb935e1817df4c633397680e963d635ed42e26.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade33
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 |