diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-03-17 10:33:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-17 10:33:40 +0000 |
| commit | 22ee7b45c6dd18c49bfeca8e3a53c1a0cf5ee063 (patch) | |
| tree | be11114b377fd09a903a27061312d1de220cce55 /xci/installer/osa | |
| parent | 262b2a6e16be8abe06edac377094bcbaa84da378 (diff) | |
| parent | 996507283ee1127ddffc926a41e3ac7741568c30 (diff) | |
Merge "xci: osa: Drop haproxy workaround"
Diffstat (limited to 'xci/installer/osa')
| -rw-r--r-- | xci/installer/osa/playbooks/configure-opnfvhost.yml | 6 |
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 |