diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-02 12:33:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-02 12:33:47 -0400 |
| commit | ee9413cebdb8a7c5ff03a5da767b1c74742bc898 (patch) | |
| tree | e629c528cc1089a64cb2bb6f3f5466a355a11b41 /roles/etcd | |
| parent | af6025be5c26e505e2577f84528d7bcf78f046e2 (diff) | |
| parent | dbb140a649a5540102e3af1d74cbacdd12f1d04a (diff) | |
| download | openshift-ee9413cebdb8a7c5ff03a5da767b1c74742bc898.tar.gz openshift-ee9413cebdb8a7c5ff03a5da767b1c74742bc898.tar.bz2 openshift-ee9413cebdb8a7c5ff03a5da767b1c74742bc898.tar.xz openshift-ee9413cebdb8a7c5ff03a5da767b1c74742bc898.zip | |
Merge pull request #1953 from abutcher/etcd-certificates
Refactor etcd certificates roles.
Diffstat (limited to 'roles/etcd')
| -rw-r--r-- | roles/etcd/meta/main.yml | 4 | ||||
| -rw-r--r-- | roles/etcd/templates/etcd.conf.j2 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/etcd/meta/main.yml b/roles/etcd/meta/main.yml index 7156a9fff..cfd72dfbc 100644 --- a/roles/etcd/meta/main.yml +++ b/roles/etcd/meta/main.yml @@ -7,7 +7,7 @@ galaxy_info: description: etcd management company: Red Hat, Inc. license: Apache License, Version 2.0 - min_ansible_version: 1.2 + min_ansible_version: 2.1 platforms: - name: EL versions: @@ -22,4 +22,4 @@ dependencies: port: "{{etcd_client_port}}/tcp" - service: etcd peering port: "{{ etcd_peer_port }}/tcp" -- role: etcd_common +- role: etcd_server_certificates diff --git a/roles/etcd/templates/etcd.conf.j2 b/roles/etcd/templates/etcd.conf.j2 index cd048ec60..7ccf78212 100644 --- a/roles/etcd/templates/etcd.conf.j2 +++ b/roles/etcd/templates/etcd.conf.j2 @@ -1,5 +1,5 @@ {% macro initial_cluster() -%} -{% for host in etcd_peers -%} +{% for host in etcd_peers | default([]) -%} {% if loop.last -%} {{ hostvars[host].etcd_hostname }}={{ etcd_peer_url_scheme }}://{{ hostvars[host].etcd_ip }}:{{ etcd_peer_port }} {%- else -%} |