summaryrefslogtreecommitdiffstats
path: root/xci/installer/osa
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-03-16 12:03:13 +0000
committerFatih Degirmenci <fdegir@gmail.com>2018-03-17 08:26:11 +0000
commit996507283ee1127ddffc926a41e3ac7741568c30 (patch)
treedd04cc0741eefad6c15521b6551dba1bef7e428d /xci/installer/osa
parent6c9da781da57420edf4f2a4f823c9d413ea1f516 (diff)
xci: osa: Drop haproxy workaround
There is no reference on the actual upstream problem so lets assume this is fixed and drop the workaround we had locally. Change-Id: I3f71ea2e6fdc67e342f014e572f74760a78d3816 Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/installer/osa')
-rw-r--r--xci/installer/osa/playbooks/configure-opnfvhost.yml6
1 files changed, 0 insertions, 6 deletions
diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml
index 8255995a..b0a76c33 100644
--- a/xci/installer/osa/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml
@@ -75,12 +75,6 @@
- name: copy user_variables_ceph.yml
shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/user_variables_ceph.yml {{OPENSTACK_OSA_ETC_PATH}}/user_variables_ceph.yml"
when: XCI_CEPH_ENABLED == "true"
- # TODO: We need to get rid of this as soon as the issue is fixed upstream
- - name: change the haproxy state from disable to enable
- replace:
- dest: "{{OPENSTACK_OSA_PATH}}/playbooks/os-keystone-install.yml"
- regexp: '(\s+)haproxy_state: disabled'
- replace: '\1haproxy_state: enabled'
- name: copy OPNFV OpenStack playbook
shell: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/setup-openstack.yml {{OPENSTACK_OSA_PATH}}/playbooks"
- name: copy pinned versions of OSA Roles and global requirements