diff options
| author | Sneha Deshpande <sneha.deshpande@nokia.com> | 2017-04-26 08:24:14 -0700 |
|---|---|---|
| committer | Rohan Parulekar <rohan.s.parulekar@nuagenetworks.net> | 2017-05-22 09:16:39 -0700 |
| commit | 51bf0a3d83d933b9a764365bad6e6dc48a9953ae (patch) | |
| tree | 22f7a362712ff25c10279edcc24113373868e789 /roles/nuage_master | |
| parent | 896a0c90b34217fab19160ea48c51f926fbcdeed (diff) | |
| download | openshift-51bf0a3d83d933b9a764365bad6e6dc48a9953ae.tar.gz openshift-51bf0a3d83d933b9a764365bad6e6dc48a9953ae.tar.bz2 openshift-51bf0a3d83d933b9a764365bad6e6dc48a9953ae.tar.xz openshift-51bf0a3d83d933b9a764365bad6e6dc48a9953ae.zip | |
Copy Nuage VSD generated user certificates to Openshift master nodes
Diffstat (limited to 'roles/nuage_master')
| -rw-r--r-- | roles/nuage_master/defaults/main.yaml | 4 | ||||
| -rw-r--r-- | roles/nuage_master/tasks/main.yaml | 8 | ||||
| -rw-r--r-- | roles/nuage_master/templates/nuage-openshift-monitor.j2 | 10 |
3 files changed, 12 insertions, 10 deletions
diff --git a/roles/nuage_master/defaults/main.yaml b/roles/nuage_master/defaults/main.yaml deleted file mode 100644 index c90f4f443..000000000 --- a/roles/nuage_master/defaults/main.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -nuage_master_cspadminpasswd: "" -nuage_master_adminusername: admin -nuage_master_adminuserpasswd: admin diff --git a/roles/nuage_master/tasks/main.yaml b/roles/nuage_master/tasks/main.yaml index fefd28bbd..4f8adb63e 100644 --- a/roles/nuage_master/tasks/main.yaml +++ b/roles/nuage_master/tasks/main.yaml @@ -33,6 +33,14 @@ - include: certificates.yml +- name: Install Nuage VSD user certificate + become: yes + copy: src="{{ vsd_user_cert_file }}" dest="{{ cert_output_dir }}/{{ vsd_user_cert_file | basename }}" + +- name: Install Nuage VSD user key + become: yes + copy: src="{{ vsd_user_key_file }}" dest="{{ cert_output_dir }}/{{ vsd_user_key_file | basename }}" + - name: Create nuage-openshift-monitor.yaml become: yes template: src=nuage-openshift-monitor.j2 dest=/usr/share/nuage-openshift-monitor/nuage-openshift-monitor.yaml owner=root mode=0644 diff --git a/roles/nuage_master/templates/nuage-openshift-monitor.j2 b/roles/nuage_master/templates/nuage-openshift-monitor.j2 index de2a97e37..e077128a4 100644 --- a/roles/nuage_master/templates/nuage-openshift-monitor.j2 +++ b/roles/nuage_master/templates/nuage-openshift-monitor.j2 @@ -15,12 +15,10 @@ 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 }} +# VSD generated user certificate file location on master node +userCertificateFile: {{ cert_output_dir }}/{{ vsd_user_cert_file | basename }} +# VSD generated user key file location on master node +userKeyFile: {{ cert_output_dir }}/{{ vsd_user_key_file | basename }} # Location where logs should be saved log_dir: {{ nuage_mon_rest_server_logdir }} # Monitor rest server parameters |