diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-08-28 14:55:28 +0100 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2018-09-03 08:01:04 +0100 |
| commit | cc583f30f881ba956fb4f1402aa4dd1608b27da2 (patch) | |
| tree | 096fd5c5b96fd8a14cb0a77c16e44990c1392d91 /xci/installer/kubespray | |
| parent | ba0f4d74ff7505055a1fd911fd40a760a3370baf (diff) | |
Revert "xci: osa: Disable haproxy ssl configuration"
This reverts commit 42501f0ef7e0f0729b1c780102fb9713ef383fb3.
This also removes the entire SSL management code and we let the
haproxy_server role generate the certificates for us.
We also need to bump the openrc role to include an upstream patch
which fixes the openrc template file.
deploy-scenario:os-nosdn-nofeature
installer-type:osa
Change-Id: I9bb590c9f1d5bc63519cfb4794dc15f794cc5b07
Signed-off-by: Markos Chandras <mchandras@suse.de>
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' |