summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishal Patil <vishal.patil@nuagenetworks.net>2016-09-29 14:23:32 -0400
committerVishal Patil <vishal.patil@nuagenetworks.net>2016-09-29 14:23:32 -0400
commitb0ddb188ef1dc8484f4d9e1f7ae58dcd4ac6a299 (patch)
tree92454398b05003236e475812fa5e96f58b6ad391
parente9cdb4d014bc20ce680c6019bdaf011f2190114c (diff)
downloadopenshift-b0ddb188ef1dc8484f4d9e1f7ae58dcd4ac6a299.tar.gz
openshift-b0ddb188ef1dc8484f4d9e1f7ae58dcd4ac6a299.tar.bz2
openshift-b0ddb188ef1dc8484f4d9e1f7ae58dcd4ac6a299.tar.xz
openshift-b0ddb188ef1dc8484f4d9e1f7ae58dcd4ac6a299.zip
Addressed review comments
-rw-r--r--roles/nuage_master/meta/main.yml13
-rw-r--r--roles/nuage_master/templates/nuage-openshift-monitor.j28
2 files changed, 11 insertions, 10 deletions
diff --git a/roles/nuage_master/meta/main.yml b/roles/nuage_master/meta/main.yml
index d56529b4d..51b89fbf6 100644
--- a/roles/nuage_master/meta/main.yml
+++ b/roles/nuage_master/meta/main.yml
@@ -13,9 +13,10 @@ galaxy_info:
- cloud
- system
dependencies:
-- role: nuage_ca
-- role: nuage_common
-- 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 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 }}