summaryrefslogtreecommitdiffstats
path: root/xci/installer
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2018-04-10 14:31:02 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-04-10 14:31:02 +0000
commit55bec03a23de4bd1c008808a44ff36c25b936713 (patch)
tree00e5ad2a9a584d9adfe57957714d81c164a67197 /xci/installer
parent07bf24c6dbd37b09f1f9cd8e1dd7f46bf6bd7fff (diff)
parentbae55b8a8d7ecbbc8da20b728951ebc290245cf9 (diff)
Merge "xci: osa: Move SSL certification tasks to a new file"
Diffstat (limited to 'xci/installer')
-rw-r--r--xci/installer/osa/playbooks/configure-opnfvhost.yml23
1 files changed, 4 insertions, 19 deletions
diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml
index 6bfa075b..f12f831c 100644
--- a/xci/installer/osa/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml
@@ -127,7 +127,6 @@
- pyyaml
- python-neutronclient
- python-openstackclient
- - pyOpenSSL
- name: Install ARA callback plugin in OSA virtualenv
pip:
name: ara
@@ -154,24 +153,10 @@
chdir: "{{openstack_osa_path}}/scripts"
changed_when: True
- - name: Generate XCI private key
- openssl_privatekey:
- path: /etc/ssl/private/xci.key
- size: 2048
-
- - name: Generate XCI certificate request
- openssl_csr:
- privatekey_path: /etc/ssl/private/xci.key
- path: /etc/ssl/private/xci.csr
- common_name: "{{ xci_ssl_subject }}"
-
- - name: Generate XCI self signed certificate
- openssl_certificate:
- path: /etc/ssl/certs/xci.crt
- privatekey_path: /etc/ssl/private/xci.key
- csr_path: /etc/ssl/private/xci.csr
- provider: selfsigned
- selfsigned_not_after: 20800101000000Z
+ - name: Configure SSL certificates
+ include_tasks: "{{ xci_path }}/xci/playbooks/manage-ssl-certs.yml"
+ vars:
+ extra_args: "-c https://raw.githubusercontent.com/openstack/requirements/{{ requirements_git_install_branch }}/upper-constraints.txt"
- name: fetch xci environment
copy: