Addressed review comments

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"

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 }}