From e9cdb4d014bc20ce680c6019bdaf011f2190114c Mon Sep 17 00:00:00 2001 From: Vishal Patil Date: Mon, 26 Sep 2016 18:28:07 -0400 Subject: Changes for Nuage HA --- roles/nuage_master/templates/nuage-openshift-monitor.j2 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'roles/nuage_master/templates') diff --git a/roles/nuage_master/templates/nuage-openshift-monitor.j2 b/roles/nuage_master/templates/nuage-openshift-monitor.j2 index 075de9d9e..c663aa0fa 100644 --- a/roles/nuage_master/templates/nuage-openshift-monitor.j2 +++ b/roles/nuage_master/templates/nuage-openshift-monitor.j2 @@ -30,4 +30,11 @@ logLevel: {{ nuage_mon_log_level }} # Parameters related to the nuage monitor REST server nuageMonServer: URL: {{ nuage_mon_rest_server_url }} - certificateDirectory: {{ cert_output_dir }} + certificateDirectory: {{ cert_output_dir }} +# etcd config required for HA +etcdClientConfig: + ca: {{ etcd_ca_dir }}/{{ "ca.crt" if (openshift.master.embedded_etcd | bool) else "master.etcd-ca.crt" }} + certFile: {{ etcd_conf_dir }}/master.etcd-client.crt + keyFile: {{ etcd_conf_dir }}/master.etcd-client.key + urls: + - {{ openshift.common.hostname }}:{{ openshift.master.etcd_port }} -- cgit v1.2.3 From b0ddb188ef1dc8484f4d9e1f7ae58dcd4ac6a299 Mon Sep 17 00:00:00 2001 From: Vishal Patil Date: Thu, 29 Sep 2016 14:23:32 -0400 Subject: Addressed review comments --- roles/nuage_master/templates/nuage-openshift-monitor.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'roles/nuage_master/templates') diff --git a/roles/nuage_master/templates/nuage-openshift-monitor.j2 b/roles/nuage_master/templates/nuage-openshift-monitor.j2 index c663aa0fa..b2539517b 100644 --- a/roles/nuage_master/templates/nuage-openshift-monitor.j2 +++ b/roles/nuage_master/templates/nuage-openshift-monitor.j2 @@ -33,8 +33,8 @@ nuageMonServer: certificateDirectory: {{ cert_output_dir }} # etcd config required for HA etcdClientConfig: - ca: {{ etcd_ca_dir }}/{{ "ca.crt" if (openshift.master.embedded_etcd | bool) else "master.etcd-ca.crt" }} - certFile: {{ etcd_conf_dir }}/master.etcd-client.crt - keyFile: {{ etcd_conf_dir }}/master.etcd-client.key + ca: {{ openshift_master_config_dir }}/{{ "ca.crt" if (openshift.master.embedded_etcd | bool) else "master.etcd-ca.crt" }} + certFile: {{ openshift_master_config_dir }}/master.etcd-client.crt + keyFile: {{ openshift_master_config_dir }}/master.etcd-client.key urls: - - {{ openshift.common.hostname }}:{{ openshift.master.etcd_port }} + - {{ openshift.master.etcd_urls }} -- cgit v1.2.3