Merge "xci: Drop custom XCI certificates"

2 files changed, 1 insertions, 33 deletions

diff --git a/xci/playbooks/manage-ssl-certs.yml b/xci/playbooks/manage-ssl-certs.yml
deleted file mode 100644
index d0c5c518..00000000
--- a/xci/playbooks/manage-ssl-certs.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2018 SUSE Linux GmbH and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-- name: Install required pip packages for SSL
-  pip:
-    name: pyOpenSSL
-    state: present
-    extra_args: "{{ extra_args | default(omit) }}"
-
-- 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
diff --git a/xci/playbooks/roles/prepare-tests/templates/run-yardstick.sh.j2 b/xci/playbooks/roles/prepare-tests/templates/run-yardstick.sh.j2
index 1cb43be2..6a7fd8be 100644
--- a/xci/playbooks/roles/prepare-tests/templates/run-yardstick.sh.j2
+++ b/xci/playbooks/roles/prepare-tests/templates/run-yardstick.sh.j2
@@ -22,7 +22,7 @@ DEPLOY_SCENARIO="k8-nosdn-nofeature-noha"
 rc_file_vol="-v /root/admin.conf:/etc/yardstick/admin.conf"
 {% endif %}
 
-OS_CACERT="/etc/ssl/certs/xci.crt"
+OS_CACERT="/etc/ssl/certs/haproxy.cert"
 DOCKER_IMAGE_NAME="opnfv/yardstick"
 YARDSTICK_SCENARIO_SUITE_NAME="opnfv_${DEPLOY_SCENARIO}_daily.yaml"