diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-20 17:06:36 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-20 17:06:36 -0400 |
| commit | a724e27225775ae0d53154b831c5abd637c9a293 (patch) | |
| tree | bb04225270ad42a9a1439355cfb59e324a395c71 | |
| parent | 2f7868b04cd095e8c9f041927978b8c4c11f4970 (diff) | |
| parent | c529d49aadd6d6ed3a5193e9855ece583fad4583 (diff) | |
| download | openshift-a724e27225775ae0d53154b831c5abd637c9a293.tar.gz openshift-a724e27225775ae0d53154b831c5abd637c9a293.tar.bz2 openshift-a724e27225775ae0d53154b831c5abd637c9a293.tar.xz openshift-a724e27225775ae0d53154b831c5abd637c9a293.zip | |
Merge pull request #1756 from abhat/configurable_admin_user_pass
Configurable admin username and passsword for Openshift enterprise in Nuage.
| -rw-r--r-- | roles/nuage_master/templates/nuage-openshift-monitor.j2 | 6 | ||||
| -rw-r--r-- | roles/nuage_master/vars/main.yaml | 3 | ||||
| -rw-r--r-- | roles/nuage_node/vars/main.yaml | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/roles/nuage_master/templates/nuage-openshift-monitor.j2 b/roles/nuage_master/templates/nuage-openshift-monitor.j2 index 7228e646b..075de9d9e 100644 --- a/roles/nuage_master/templates/nuage-openshift-monitor.j2 +++ b/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 diff --git a/roles/nuage_master/vars/main.yaml b/roles/nuage_master/vars/main.yaml index ec4562c77..c4c15d65c 100644 --- a/roles/nuage_master/vars/main.yaml +++ b/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' diff --git a/roles/nuage_node/vars/main.yaml b/roles/nuage_node/vars/main.yaml index a4d7052a7..86486259f 100644 --- a/roles/nuage_node/vars/main.yaml +++ b/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" |