diff options
| author | Vishal Patil <vishal.patil@nuagenetworks.net> | 2016-09-26 18:28:07 -0400 |
|---|---|---|
| committer | Vishal Patil <vishal.patil@nuagenetworks.net> | 2016-09-27 15:07:51 -0400 |
| commit | e9cdb4d014bc20ce680c6019bdaf011f2190114c (patch) | |
| tree | 4ce88233256054102e5182e228e403fe0849994b /roles/nuage_master | |
| parent | d5f9fa24a4e5d44ba5eb8637da5393195f0335c9 (diff) | |
| download | openshift-e9cdb4d014bc20ce680c6019bdaf011f2190114c.tar.gz openshift-e9cdb4d014bc20ce680c6019bdaf011f2190114c.tar.bz2 openshift-e9cdb4d014bc20ce680c6019bdaf011f2190114c.tar.xz openshift-e9cdb4d014bc20ce680c6019bdaf011f2190114c.zip | |
Changes for Nuage HA
Diffstat (limited to 'roles/nuage_master')
| -rw-r--r-- | roles/nuage_master/meta/main.yml | 1 | ||||
| -rw-r--r-- | roles/nuage_master/templates/nuage-openshift-monitor.j2 | 9 | ||||
| -rw-r--r-- | roles/nuage_master/vars/main.yaml | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/roles/nuage_master/meta/main.yml b/roles/nuage_master/meta/main.yml index fdead100c..d56529b4d 100644 --- a/roles/nuage_master/meta/main.yml +++ b/roles/nuage_master/meta/main.yml @@ -14,6 +14,7 @@ galaxy_info: - system dependencies: - role: nuage_ca +- role: nuage_common - role: os_firewall os_firewall_allow: - service: openshift-monitor 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 }} diff --git a/roles/nuage_master/vars/main.yaml b/roles/nuage_master/vars/main.yaml index 92e716a45..b395eba99 100644 --- a/roles/nuage_master/vars/main.yaml +++ b/roles/nuage_master/vars/main.yaml @@ -8,7 +8,6 @@ cert_output_dir: /usr/share/nuage-openshift-monitor kube_config: /usr/share/nuage-openshift-monitor/nuage.kubeconfig kubemon_yaml: /usr/share/nuage-openshift-monitor/nuage-openshift-monitor.yaml master_config_yaml: "{{ openshift_master_config_dir }}/master-config.yaml" -nuage_mon_rest_server_port: "{{ nuage_openshift_monitor_rest_server_port | default('9443') }}" nuage_mon_rest_server_url: "0.0.0.0:{{ nuage_mon_rest_server_port }}" nuage_mon_rest_server_logdir: "{{ nuage_openshift_monitor_log_dir | default('/var/log/nuage-openshift-monitor') }}" nuage_mon_log_level: "{{ nuage_openshift_monitor_log_level | default('3') }}" |