diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-09-03 09:07:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-03 09:07:21 +0000 |
| commit | fb2cbfce4e9a1ea6e60aa2a361e02fdb189042a2 (patch) | |
| tree | 0de5b2f5e2a82810dcff52709374530d8c117006 /xci/installer/kubespray | |
| parent | a8f65dd6f72e5ded2a652a892c43b47f16fb5610 (diff) | |
| parent | cc583f30f881ba956fb4f1402aa4dd1608b27da2 (diff) | |
Merge "Revert "xci: osa: Disable haproxy ssl configuration""
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 00a8053f..36104b6c 100644 --- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml +++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml @@ -83,9 +83,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' |