diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-10-24 15:13:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-24 15:13:28 -0400 |
| commit | 5f2caadc762240381ecd735f3f216044fb0fd533 (patch) | |
| tree | 2f26046e5ddb3e90e7de9c2b46ffeebbf68b8a74 /roles | |
| parent | 9e8edbc4bdcbc3495f2ea86d5a12b15e13da47ac (diff) | |
| parent | fc08e18d79e957783da3f8fa0ec97bac7a1a13d8 (diff) | |
| download | openshift-5f2caadc762240381ecd735f3f216044fb0fd533.tar.gz openshift-5f2caadc762240381ecd735f3f216044fb0fd533.tar.bz2 openshift-5f2caadc762240381ecd735f3f216044fb0fd533.tar.xz openshift-5f2caadc762240381ecd735f3f216044fb0fd533.zip | |
Merge pull request #2641 from vishpat/cert-validity
Added a parameter for cert validity for Nuage components
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/nuage_common/defaults/main.yaml | 2 | ||||
| -rw-r--r-- | roles/nuage_master/tasks/certificates.yml | 2 | ||||
| -rw-r--r-- | roles/nuage_node/tasks/certificates.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/roles/nuage_common/defaults/main.yaml b/roles/nuage_common/defaults/main.yaml index 9b777213e..16dac8720 100644 --- a/roles/nuage_common/defaults/main.yaml +++ b/roles/nuage_common/defaults/main.yaml @@ -10,4 +10,4 @@ nuage_master_mon_dir: /usr/share/nuage-openshift-monitor nuage_node_plugin_dir: /usr/share/vsp-openshift nuage_mon_rest_server_port: "{{ nuage_openshift_monitor_rest_server_port | default('9443') }}" - +nuage_mon_cert_validity_period: "{{ nuage_cert_validity_period | default('3650') }}" diff --git a/roles/nuage_master/tasks/certificates.yml b/roles/nuage_master/tasks/certificates.yml index 32b024487..0a2f375cd 100644 --- a/roles/nuage_master/tasks/certificates.yml +++ b/roles/nuage_master/tasks/certificates.yml @@ -15,7 +15,7 @@ - name: Generate the crt file command: > - openssl x509 -req -in "{{ nuage_mon_rest_server_crt_dir }}/restServer.req" -CA "{{ nuage_ca_crt }}" -CAkey "{{ nuage_ca_key }}" -CAserial "{{ nuage_ca_serial }}" -out "{{ nuage_ca_master_rest_server_crt }}" + openssl x509 -req -in "{{ nuage_mon_rest_server_crt_dir }}/restServer.req" -CA "{{ nuage_ca_crt }}" -CAkey "{{ nuage_ca_key }}" -CAserial "{{ nuage_ca_serial }}" -out "{{ nuage_ca_master_rest_server_crt }}" -days "{{ nuage_mon_cert_validity_period }}" delegate_to: "{{ nuage_ca_master }}" - name: Remove the req file diff --git a/roles/nuage_node/tasks/certificates.yml b/roles/nuage_node/tasks/certificates.yml index 0fe6f7bac..7fcd4274d 100644 --- a/roles/nuage_node/tasks/certificates.yml +++ b/roles/nuage_node/tasks/certificates.yml @@ -15,7 +15,7 @@ - name: Generate the crt file command: > - openssl x509 -req -in "{{ nuage_plugin_rest_client_crt_dir }}/restClient.req" -CA "{{ nuage_ca_crt }}" -CAkey "{{ nuage_ca_key }}" -CAserial "{{ nuage_ca_serial }}" -out "{{ nuage_ca_master_plugin_crt }}" -extensions clientauth -extfile "{{ nuage_ca_dir }}"/openssl.cnf + openssl x509 -req -in "{{ nuage_plugin_rest_client_crt_dir }}/restClient.req" -CA "{{ nuage_ca_crt }}" -CAkey "{{ nuage_ca_key }}" -CAserial "{{ nuage_ca_serial }}" -out "{{ nuage_ca_master_plugin_crt }}" -extensions clientauth -extfile "{{ nuage_ca_dir }}"/openssl.cnf -days {{ nuage_mon_cert_validity_period }} delegate_to: "{{ nuage_ca_master }}" - name: Remove the req file |