aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/config-osa/files
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/adapters/ansible/roles/config-osa/files')
-rw-r--r--deploy/adapters/ansible/roles/config-osa/files/fetch-files.yml (renamed from deploy/adapters/ansible/roles/config-osa/files/fetch-openrc.yml)10
-rw-r--r--deploy/adapters/ansible/roles/config-osa/files/http.yml25
2 files changed, 10 insertions, 25 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/files/fetch-openrc.yml b/deploy/adapters/ansible/roles/config-osa/files/fetch-files.yml
index 1251cbf1..346ef2fd 100644
--- a/deploy/adapters/ansible/roles/config-osa/files/fetch-openrc.yml
+++ b/deploy/adapters/ansible/roles/config-osa/files/fetch-files.yml
@@ -16,3 +16,13 @@
src: /root/openrc
dest: /opt/openrc
flat: "yes"
+
+- name: Fetch haproxy.cert
+ hosts: haproxy_hosts[0]
+ max_fail_percentage: 20
+ user: root
+ tasks:
+ - fetch:
+ src: /etc/ssl/certs/haproxy.cert
+ dest: /opt/os_cacert
+ flat: "yes"
diff --git a/deploy/adapters/ansible/roles/config-osa/files/http.yml b/deploy/adapters/ansible/roles/config-osa/files/http.yml
deleted file mode 100644
index d5c1e64e..00000000
--- a/deploy/adapters/ansible/roles/config-osa/files/http.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# #############################################################################
-# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD 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: change https to http in haproxy configuratio
- hosts: network_hosts
- gather_facts: "{{ gather_facts | default(True) }}"
- max_fail_percentage: 20
- user: root
- tasks:
- - name: change the haproxy configuration
- shell: "sed -i 's/ssl crt.*//g' /etc/haproxy/haproxy.cfg;
- sed -i 's/https$/http/g' /etc/haproxy/haproxy.cfg"
- when: openstack_service_publicuri_proto == "http"
-
- - name: restart haproxy service
- service:
- name: haproxy
- state: restarted
- when: openstack_service_publicuri_proto == "http"