diff options
author | Andrew Butcher <abutcher@afrolegs.com> | 2016-10-04 17:20:07 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-04 17:20:07 -0400 |
commit | 91809982259a63a1b7065dd2c503d94b5ca66c2a (patch) | |
tree | 7244ae08a3182d7fa41f49563e64576b205fb762 /roles/nuage_master/templates | |
parent | b31bcfb37e8740cea894eb60877d688bc3df2922 (diff) | |
parent | 21891653d3b287e6d78082ee03f878de415f16de (diff) | |
download | openshift-91809982259a63a1b7065dd2c503d94b5ca66c2a.tar.gz openshift-91809982259a63a1b7065dd2c503d94b5ca66c2a.tar.bz2 openshift-91809982259a63a1b7065dd2c503d94b5ca66c2a.tar.xz openshift-91809982259a63a1b7065dd2c503d94b5ca66c2a.zip |
Merge pull request #2511 from vishpat/nuage_ha
Changes for Nuage HA
Diffstat (limited to 'roles/nuage_master/templates')
-rw-r--r-- | roles/nuage_master/templates/nuage-openshift-monitor.j2 | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/roles/nuage_master/templates/nuage-openshift-monitor.j2 b/roles/nuage_master/templates/nuage-openshift-monitor.j2 index 075de9d9e..b2539517b 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: {{ 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.master.etcd_urls }} |