Sfoglia il codice sorgente

Support configurable admin user and password for the enterprise
Prefix changes for admin and password with nuage_master

Aniket Bhat 9 anni fa
parent
commit
c529d49aad

+ 6 - 0
roles/nuage_master/templates/nuage-openshift-monitor.j2

@@ -15,6 +15,12 @@ vspVersion: {{ vsp_version }}
 enterpriseName: {{ enterprise }} 
 # Name of the domain in which pods will reside
 domainName: {{ domain }}
+# CSP admin user's password
+cspAdminPassword: {{ nuage_master_cspadminpasswd }}
+# Enterprise admin user name
+enterpriseAdminUser: {{ nuage_master_adminusername }}
+# Enterprise admin password
+enterpriseAdminPassword: {{ nuage_master_adminuserpasswd }}
 # Location where logs should be saved
 log_dir: {{ nuage_mon_rest_server_logdir }}
 # Monitor rest server paramters

+ 3 - 0
roles/nuage_master/vars/main.yaml

@@ -15,3 +15,6 @@ nuage_ca_master_rest_server_key: "{{ nuage_mon_rest_server_crt_dir }}/nuageMonSe
 nuage_ca_master_rest_server_crt: "{{ nuage_mon_rest_server_crt_dir }}/nuageMonServer.crt" 
 
 nuage_master_crt_dir : /usr/share/nuage-openshift-monitor
+nuage_master_cspadminpasswd: ''
+nuage_master_adminsusername: 'admin'
+nuage_master_adminuserpasswd: 'admin'

+ 1 - 1
roles/nuage_node/vars/main.yaml

@@ -8,7 +8,7 @@ ca_cert: "{{ vsp_openshift_dir }}/ca.crt"
 api_server: "{{ openshift_node_master_api_url }}"
 nuage_mon_rest_server_port: "{{ nuage_openshift_monitor_rest_server_port | default('9443') }}"
 nuage_mon_rest_server_url: "https://{{ openshift_master_cluster_hostname }}:{{ nuage_mon_rest_server_port }}"
-docker_bridge: "docker0"
+docker_bridge: "{{ nuage_docker_bridge | default('docker0') }}"
 rest_client_cert: "{{ vsp_openshift_dir }}/nuageMonClient.crt"
 rest_client_key: "{{ vsp_openshift_dir }}/nuageMonClient.key"
 rest_server_ca_cert: "{{ vsp_openshift_dir }}/nuageMonCA.crt"