Merge pull request #953 from bogdando/multi-stack

Remove patching OSP as the package is released now

Author: openshift-merge-bot[bot]

devsetup/tripleo/tripleo_install.sh

@@ -225,87 +225,6 @@ openstack overcloud deploy --stack overcloud \
     -e /home/zuul/vips_provision_out.yaml -e /home/zuul/network_provision_out.yaml --disable-validations --heat-type pod \
     --disable-protected-resource-types --log-file overcloud_deployment.log
 if [ $EDPM_COMPUTE_CELLS -gt 1 ] ; then
-    # FIXME(bogdando): w/a OSP17.1 https://bugzilla.redhat.com/show_bug.cgi?id=2294898 until the fix merged and shipped
-    sudo dnf install -y patch
-    cd /usr/share/ansible
-    cat > /tmp/patch << EOF
---- a/tripleo-playbooks/create-nova-cell-v2.yaml
-+++ b/tripleo-playbooks/create-nova-cell-v2.yaml
-@@ -21,22 +21,23 @@
-     tripleo_cellv2_cell_name: "{{ tripleo_cellv2_cell_name }}"
-     # containercli can be tropped when we fully switched to podman
-     tripleo_cellv2_containercli: "{{ tripleo_cellv2_containercli }}"
--    tripleo_cellv2_cellcontroller_group: "{{ groups['CellController'] }}"
-   tasks:
-     - import_role:
-         name: tripleo_cellv2
-         tasks_from: check_cell_exist.yml
-
--- hosts: CellController[0]
-+- hosts: Controller[0]
-   remote_user: stack
--  gather_facts: true
-+  gather_facts: false
-   vars:
-     tripleo_cellv2_cell_name: "{{ tripleo_cellv2_cell_name }}"
-     # containercli can be tropped when we fully switched to podman
-     tripleo_cellv2_containercli: "{{ tripleo_cellv2_containercli }}"
--    tripleo_cellv2_cellcontroller_group: "{{ groups['CellController'] }}"
-+    tripleo_cellv2_cellcontroller_group: "{{ groups[tripleo_cellv2_cell_name ~ '_' ~ tripleo_cellv2_cellcontroller_rolename] }}"
-   tasks:
--    - import_role:
-+    - delegate_to: "{{ tripleo_cellv2_cellcontroller_group[0] }}"
-+      delegate_facts: false
-+      import_role:
-         name: tripleo_cellv2
-         tasks_from: extract_cell_information.yml
-
-@@ -47,7 +48,7 @@
-     tripleo_cellv2_cell_name: "{{ tripleo_cellv2_cell_name }}"
-     # containercli can be tropped when we fully switched to podman
-     tripleo_cellv2_containercli: "{{ tripleo_cellv2_containercli }}"
--    tripleo_cellv2_cellcontroller_group: "{{ groups['CellController'] }}"
-+    tripleo_cellv2_cellcontroller_group: "{{ groups[tripleo_cellv2_cell_name ~ '_' ~ tripleo_cellv2_cellcontroller_rolename] }}"
-   tasks:
-     - import_role:
-         name: tripleo_cellv2
-
---- a/roles/tripleo_cellv2/defaults/main.yml
-+++ b/roles/tripleo_cellv2/defaults/main.yml
-@@ -18,10 +18,11 @@
- # All variables intended for modification should be placed in this file.
-
- tripleo_cellv2_debug: "{{ (ansible_verbosity | int) >= 2 | bool }}"
--tripleo_cellv2_cell_name: ""
-+tripleo_cellv2_cell_name: "cell1"
- # containercli can be tropped when we fully switched to podman
- tripleo_cellv2_containercli: "docker"
-
--tripleo_cellv2_cellcontroller_group: "{{ groups['CellController'] }}"
--tripleo_cellv2_cell_database_vip: "{{ hostvars[tripleo_cellv2_cellcontroller_group[0]]['cell_database_vip'] }}"
--tripleo_cellv2_cell_transport_url: "{{ hostvars[tripleo_cellv2_cellcontroller_group[0]]['cell_transport_url'] }}"
-+tripleo_cellv2_cellcontroller_rolename: "CellController"
-+tripleo_cellv2_cellcontroller_group: "{{ groups[tripleo_cellv2_cellcontroller_rolename] }}"
-+tripleo_cellv2_cell_database_vip: ""
-+tripleo_cellv2_cell_transport_url: ""
-
---- a/roles/tripleo_cellv2/tasks/create_cell.yml
-+++ b/roles/tripleo_cellv2/tasks/create_cell.yml
-@@ -21,8 +21,8 @@
-     shell: >-
-       {{ tripleo_cellv2_containercli }} exec -i -u root nova_api
-       nova-manage cell_v2 create_cell --name {{ tripleo_cellv2_cell_name }}
--      --database_connection "{scheme}://{username}:{password}@{{ tripleo_cellv2_cell_database_vip }}/nova?{query}"
--      --transport-url "{{ tripleo_cellv2_cell_transport_url }}"
-+      --database_connection "{scheme}://{username}:{password}@{{ tripleo_cellv2_cell_database_vip | default(cell_database_vip, true) }}/nova?{query}"
-+      --transport-url "{{ tripleo_cellv2_cell_transport_url | default(cell_transport_url, true) }}"
-
-   - name: List Cells
-     shell: >
-EOF
-    sudo patch -p1 < /tmp/patch
-    cd -
-
     mkdir -p /home/zuul/inventories
     cp /home/zuul/overcloud-deploy/overcloud/config-download/overcloud/tripleo-ansible-inventory.yaml /home/zuul/inventories/overcloud.yaml
     export OS_CLOUD=overcloud