diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-20 14:56:40 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-20 14:56:40 -0400 |
| commit | 1b4bf065f84a28426a010cdc47669b88d5515e34 (patch) | |
| tree | 4214a6f9977b215eaf1a250147e17838939a9543 /playbooks/common/openshift-etcd | |
| parent | 5373ca09312ebbd1b7eda749f426e5b185463264 (diff) | |
| parent | add2c9f8b2b64b9a02834c1d321bfecdf3ec7b5b (diff) | |
| download | openshift-1b4bf065f84a28426a010cdc47669b88d5515e34.tar.gz openshift-1b4bf065f84a28426a010cdc47669b88d5515e34.tar.bz2 openshift-1b4bf065f84a28426a010cdc47669b88d5515e34.tar.xz openshift-1b4bf065f84a28426a010cdc47669b88d5515e34.zip | |
Merge pull request #1754 from abutcher/etcd-cert-fixes
Bug 1299065: Fix etcd hostname/ip address handling
Diffstat (limited to 'playbooks/common/openshift-etcd')
| -rw-r--r-- | playbooks/common/openshift-etcd/config.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/playbooks/common/openshift-etcd/config.yml b/playbooks/common/openshift-etcd/config.yml index 2f07b2f51..01c092625 100644 --- a/playbooks/common/openshift-etcd/config.yml +++ b/playbooks/common/openshift-etcd/config.yml @@ -22,6 +22,8 @@ etcd_cert_subdir: etcd-{{ openshift.common.hostname }} etcd_cert_config_dir: /etc/etcd etcd_cert_prefix: + etcd_hostname: "{{ openshift.common.hostname }}" + etcd_ip: "{{ openshift.common.ip }}" - name: Create temp directory for syncing certs hosts: localhost @@ -43,7 +45,7 @@ | oo_filter_list(filter_attr='etcd_server_certs_missing') }}" sync_tmpdir: "{{ hostvars.localhost.g_etcd_mktemp.stdout }}" roles: - - etcd_certificates + - openshift_etcd_certificates post_tasks: - name: Create a tarball of the etcd certs command: > @@ -69,7 +71,7 @@ sync_tmpdir: "{{ hostvars.localhost.g_etcd_mktemp.stdout }}" etcd_url_scheme: https etcd_peer_url_scheme: https - etcd_peers_group: oo_etcd_to_config + etcd_peers: "{{ groups.oo_etcd_to_config | default([], true) }}" pre_tasks: - name: Ensure certificate directory exists file: @@ -91,7 +93,7 @@ sync_tmpdir: "{{ hostvars.localhost.g_etcd_mktemp.stdout }}" etcd_url_scheme: https etcd_peer_url_scheme: https - etcd_peers_group: oo_etcd_to_config + etcd_peers: "{{ groups.oo_etcd_to_config | default([], true) }}" pre_tasks: - name: Ensure certificate directory exists file: |