diff options
author | 2018-09-03 17:21:52 +0100 | |
---|---|---|
committer | 2018-09-04 05:59:43 +0000 | |
commit | 680f203f5b37b10fbaaf69c04b983cf333c12dc6 (patch) | |
tree | b56c9ece0436dee47729dc51aa5b9ed9b1615b0f /xci/installer/kubespray | |
parent | 933c7a0f36c970d24954b9ba1552a29a75b43976 (diff) |
xci: osa: Restore self-signed XCI certificate
This reverts commit cc583f30f881ba956fb4f1402aa4dd1608b27da2.
We still need to have control over the generated certificates so lets
keep creating our own.
deploy-scenario:os-nosdn-nofeature
installer-type:osa
Change-Id: I9e730bce2dba578ca0b561b168eaf1c2eca1282d
Diffstat (limited to 'xci/installer/kubespray')
-rw-r--r-- | xci/installer/kubespray/playbooks/configure-opnfvhost.yml | 3 | ||||
-rw-r--r-- | xci/installer/kubespray/playbooks/configure-targethosts.yml | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml index 36104b6c..00a8053f 100644 --- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml +++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml @@ -83,6 +83,9 @@ - { name: 'netaddr' } - { name: 'ansible-modules-hashivault' } + - name: Configure SSL certificates + include_tasks: "{{ xci_path }}/xci/playbooks/manage-ssl-certs.yml" + - name: fetch xci environment copy: src: "{{ xci_path }}/.cache/xci.env" diff --git a/xci/installer/kubespray/playbooks/configure-targethosts.yml b/xci/installer/kubespray/playbooks/configure-targethosts.yml index 859460c6..7989bfb6 100644 --- a/xci/installer/kubespray/playbooks/configure-targethosts.yml +++ b/xci/installer/kubespray/playbooks/configure-targethosts.yml @@ -37,4 +37,6 @@ when: xci_flavor == 'ha' - role: "haproxy_server" haproxy_service_configs: "{{ haproxy_default_services}}" + haproxy_user_ssl_cert: "/etc/ssl/certs/xci.crt" + haproxy_user_ssl_key: "/etc/ssl/private/xci.key" when: xci_flavor == 'ha' |