Merge "ir plugin: Fix issues related to migration-tool package and OVN image preparation"

2 files changed, 32 insertions, 54 deletions

diff --git a/migration/infrared/tripleo-ovn-migration/main.yml b/migration/infrared/tripleo-ovn-migration/main.yml
index 999c36a..600e31e 100644
--- a/migration/infrared/tripleo-ovn-migration/main.yml
+++ b/migration/infrared/tripleo-ovn-migration/main.yml
@@ -8,47 +8,11 @@
             name: python-virtualenv
             state: present
 
-      - name: Enable delorean deps repository
-        yum_repository:
-            name: dlrn-master-deps
-            description: dlrn-master-deps
-            baseurl: https://trunk.rdoproject.org/centos7-master/deps/latest/
-            gpgcheck: no
-            includepkgs: python2-openvswitch
-
-      - name: Enable delorean current repository
-        yum_repository:
-            name: dlrn-master
-            description: dlrn-master
-            baseurl: https://trunk.rdoproject.org/centos7-master/current/
-            gpgcheck: no
-            includepkgs: python-networking-ovn,python-networking-ovn-migration-tool
-
-      - name: Install python2 openvswitch
-        yum:
-            name: python2-openvswitch
-            state: present
-
-      - name: Install python-networking-ovn
-        yum:
-            name: python-networking-ovn
-            state: present
-
       - name: Install python networking ovn migration tool
         yum:
             name: python-networking-ovn-migration-tool
             state: present
 
-      - name: Disable delorean deps repository
-        yum_repository:
-            name: dlrn-master-deps
-            state: absent
-
-      - name: Disable delorean repository
-        yum_repository:
-            name: dlrn-master
-            state: absent
-
       - name: Set host_key_checking to False in ansible.cfg
         ini_file:
             path=/etc/ansible/ansible.cfg
diff --git a/migration/infrared/tripleo-ovn-migration/roles/prepare-migration/tasks/main.yml b/migration/infrared/tripleo-ovn-migration/roles/prepare-migration/tasks/main.yml
index 599e75d..1ae7ddd 100644
--- a/migration/infrared/tripleo-ovn-migration/roles/prepare-migration/tasks/main.yml
+++ b/migration/infrared/tripleo-ovn-migration/roles/prepare-migration/tasks/main.yml
@@ -1,4 +1,3 @@
-
 - name: Copy overcloud deploy script to overcloud-deploy-ovn.sh
   block:
       - name: Check if overcloud_deploy.sh is present or not
@@ -75,13 +74,22 @@
 - name: Set image tag (infrared deployment)
   block:
       - name: Get puddle version
-        shell: cat ~/core_puddle_version
+        shell: cat containers-prepare-parameter.yaml | grep -v _tag | grep tag | awk '{print $2}'
         ignore_error: True
         register: core_puddle_version
 
       - name: Set image tag from puddle version
         set_fact:
-            docker_image_tag: "{{ (core_puddle_version.stdout != '') | ternary(core_puddle_version.stdout, image_tag) }}"
+            docker_image_tag: "{{ core_puddle_version.stdout }}"
+
+      - name: Get registry namespace
+        shell: cat containers-prepare-parameter.yaml | grep -v _namespace | grep namespace | awk '{print $2}'
+        ignore_error: True
+        register: reg_ns
+
+      - name: Set registry namespace
+        set_fact:
+            reg_namespace: "{{ reg_ns.stdout }}"
 
       - debug:
           msg: "{{ core_puddle_version.stdout }}"
@@ -89,6 +97,8 @@
       - debug:
           msg: "{{ docker_image_tag }}"
 
+      - debug:
+          msg: "{{ reg_namespace }}"
   when: infrared_deployment|bool
 
 - name: Set image tag (tripleo deployment)
@@ -105,13 +115,17 @@
 - name: Add ovn container images to ovn_container_images.yaml
   lineinfile:
       dest: ~/ovn_container_images.yaml
-      line: "- imagename: {{ registry_namespace }}/{{ image_prefix }}-{{ item }}:{{ docker_image_tag }}"
+      line: "- imagename: {{ reg_namespace }}/{{ image_prefix }}-{{ item }}:{{ docker_image_tag }}"
   with_items:
       - "ovn-northd"
       - "ovn-controller"
       - "neutron-server-ovn"
       - "neutron-metadata-agent-ovn"
 
+- name: Generate docker images environment file
+  shell: |
+      echo "parameter_defaults:" > ~/docker-images-ovn.yaml
+
 - name: Set the local namespace
   block:
      - name: Extract the local namespace
@@ -123,9 +137,8 @@
            mv overcloud.tar.gz /tmp/oc_plan/
            cd /tmp/oc_plan
            tar xvf overcloud.tar.gz
-           reg=`cat /tmp/oc_plan/plan-environment.yaml  | grep DockerNeutronApiImage | awk '{ split($2, image , "/"); print image[1] }'`
-           namespace=`cat /tmp/oc_plan/plan-environment.yaml  | grep DockerNeutronApiImage | awk '{ split($2, image , "/"); print image[2] }'`
-           img=`cat plan-environment.yaml  | grep DockerNeutronApiImage | awk '{ split($2, image, "/"); print image[3] }'`
+           reg=`cat /tmp/oc_plan/environments/containers-default-parameters.yaml  | grep DockerNeutronApiImage | awk '{ split($2, image , "/"); print image[1] }'`
+           namespace=`cat /tmp/oc_plan/environments/containers-default-parameters.yaml  | grep DockerNeutronApiImage | awk '{ split($2, image , "/"); print image[2] }'`
            echo $reg/$namespace > /tmp/_reg_namespace
            rm -rf /tmp/oc_plan
 
@@ -145,17 +158,18 @@
   when:
       - local_namespace != ''
 
-- name: Generate docker images environment file
-  shell: |
-      set -exo pipefail
-      openstack overcloud container image prepare \
-      --namespace={{ local_registry }} \
-      --tag={{ docker_image_tag }} \
-      --prefix={{ image_prefix }} \
-      --output-env-file={{ output_env_file }} \
-      -e /usr/share/openstack-tripleo-heat-templates/environments/docker.yaml \
-      -e /usr/share/openstack-tripleo-heat-templates/environments/docker-ha.yaml \
-      -e {{ neutron_ovn_env_path }}
+- name: Add ovn container images to docker images environment file
+  lineinfile:
+      dest: ~/docker-images-ovn.yaml
+      line: "  {{ item.name }}: {{ local_registry }}/{{ image_prefix }}-{{ item.image_name }}:{{ docker_image_tag }}"
+  with_items:
+      - { name: DockerNeutronApiImage, image_name: neutron-server-ovn}
+      - { name: DockerNeutronConfigImage, image_name: neutron-server-ovn}
+      - { name: DockerOvnMetadataImage, image_name: neutron-metadata-agent-ovn}
+      - { name: DockerOvnControllerImage, image_name: ovn-controller}
+      - { name: DockerOvnControllerConfigImage, image_name: ovn-controller}
+      - { name: DockerOvnDbsImage, image_name: ovn-northd}
+      - { name: DockerOvnDbsConfigImage, image_name: ovn-northd}
 
 - name: Upload the ovn docker images to the local registry
   shell: |