diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-09-16 13:01:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-16 13:01:31 +0000 |
| commit | 84e736bed99882021d5aa74f84ac185bef2bcc89 (patch) | |
| tree | bfbbe5052a5bbef5aedddc0fa363bd980dfdd37d /xci/installer/kubespray | |
| parent | e7ded150b54460b9e55e5f0ea1da0a2942b23b5f (diff) | |
| parent | 3cf4e396fe8621afad624f3935ab69e9e082388f (diff) | |
Merge "xci: Drop custom XCI certificates"
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, 0 insertions, 5 deletions
diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml index 11866bd3..82ece961 100644 --- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml +++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml @@ -100,9 +100,6 @@ - { 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 7989bfb6..859460c6 100644 --- a/xci/installer/kubespray/playbooks/configure-targethosts.yml +++ b/xci/installer/kubespray/playbooks/configure-targethosts.yml @@ -37,6 +37,4 @@ 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' |