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 | |
| 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')
| -rw-r--r-- | roles/nuage_master/meta/main.yml | 12 | ||||
| -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, 15 insertions, 7 deletions
diff --git a/roles/nuage_master/meta/main.yml b/roles/nuage_master/meta/main.yml index fdead100c..51b89fbf6 100644 --- a/roles/nuage_master/meta/main.yml +++ b/roles/nuage_master/meta/main.yml @@ -13,8 +13,10 @@ galaxy_info: - cloud - system dependencies: -- role: nuage_ca -- role: os_firewall - os_firewall_allow: - - service: openshift-monitor - port: "{{ nuage_mon_rest_server_port }}/tcp" + - role: nuage_ca + - role: nuage_common + - role: openshift_etcd_client_certificates + - role: os_firewall + os_firewall_allow: + - service: openshift-monitor + port: "{{ nuage_mon_rest_server_port }}/tcp" 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 }} 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') }}" |