diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-05-18 12:31:35 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-05-18 12:31:35 -0400 |
| commit | e562f47211c1c4f540ec0db9b0776fc3c15f39f4 (patch) | |
| tree | 43389239afb19bebdd6210a02f2f06a242b71c59 | |
| parent | b570313522ac1d47b56190c2f1fe4c2a9f54aad5 (diff) | |
| parent | 4e1c508e2c5ad560cbcca04ab98fb040dfa676e6 (diff) | |
| download | openshift-e562f47211c1c4f540ec0db9b0776fc3c15f39f4.tar.gz openshift-e562f47211c1c4f540ec0db9b0776fc3c15f39f4.tar.bz2 openshift-e562f47211c1c4f540ec0db9b0776fc3c15f39f4.tar.xz openshift-e562f47211c1c4f540ec0db9b0776fc3c15f39f4.zip | |
Merge pull request #1917 from vishpat/ha
Use cluster hostname while generating certificate on the master nodes
| -rw-r--r-- | roles/nuage_master/tasks/certificates.yml | 2 | ||||
| -rw-r--r-- | roles/nuage_master/vars/main.yaml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/roles/nuage_master/tasks/certificates.yml b/roles/nuage_master/tasks/certificates.yml index 0d3c69467..32b024487 100644 --- a/roles/nuage_master/tasks/certificates.yml +++ b/roles/nuage_master/tasks/certificates.yml @@ -10,7 +10,7 @@ - name: Create the req file command: > - openssl req -key "{{ nuage_ca_master_rest_server_key }}" -new -out "{{ nuage_mon_rest_server_crt_dir }}/restServer.req" -subj "/CN={{ ansible_nodename }}" + openssl req -key "{{ nuage_ca_master_rest_server_key }}" -new -out "{{ nuage_mon_rest_server_crt_dir }}/restServer.req" -subj "/CN={{ nuage_mon_rest_server_host }}" delegate_to: "{{ nuage_ca_master }}" - name: Generate the crt file diff --git a/roles/nuage_master/vars/main.yaml b/roles/nuage_master/vars/main.yaml index 5bc735bb6..92e716a45 100644 --- a/roles/nuage_master/vars/main.yaml +++ b/roles/nuage_master/vars/main.yaml @@ -17,6 +17,8 @@ nuage_mon_rest_server_crt_dir: "{{ nuage_ca_master_crt_dir }}/{{ ansible_nodenam nuage_ca_master_rest_server_key: "{{ nuage_mon_rest_server_crt_dir }}/nuageMonServer.key" nuage_ca_master_rest_server_crt: "{{ nuage_mon_rest_server_crt_dir }}/nuageMonServer.crt" +nuage_mon_rest_server_host: "{{ openshift.master.cluster_hostname | default(openshift.common.hostname) }}" + nuage_master_crt_dir : /usr/share/nuage-openshift-monitor nuage_service_account: system:serviceaccount:default:nuage |