commit 20df11513e2a6fe2337e5261581795ab237981e0
Author: Jose Luis Franco Arza <jfrancoa@redhat.com>
Date:   Mon Sep 21 17:45:39 2020 +0200

    Remove _stein _ceph3 parameters before converge.
    
    Leaving the specific FFU parameters before running converge
    could be problematic when scaling out or performing any
    future operation in the environment.
    
    Adding the code to get rid of them on the FFU automation. As
    otherwise the CI job would fail due to the addition of this
    extra verification [0] in python-tripleoclient.
    
    [0] - I24715f5e55d4cd6cf9879345980d3a3c5ab8830c
    
    Change-Id: I1d2c206ab46a04b11224b47a3474713ff3525a8f
    (cherry picked from commit 437e933b725088027df8778d74fa1a0af23f3887)

diff --git a/defaults/main.yml b/defaults/main.yml
index 3722b2c..93ca956 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -271,7 +271,7 @@ ceph3_registry_params:
 
 # stein registry parameters
 stein_registry_params:
-  namespace_stein: "{{ full_namespace }}"
+  namespace_stein: "{{ full_namespace | default('registry.access.redhat.com') }}"
   tag_stein: "20200115.1"
   name_prefix_stein: "rhosp15-openstack-"
 
diff --git a/tasks/upgrade/overcloud_upgrade_converge.yml b/tasks/upgrade/overcloud_upgrade_converge.yml
index 7919527..4282c43 100644
--- a/tasks/upgrade/overcloud_upgrade_converge.yml
+++ b/tasks/upgrade/overcloud_upgrade_converge.yml
@@ -1,4 +1,20 @@
 ---
+- name: check customized {{ uc_containers_prepare_file }} exists
+  stat:
+    path: "{{ working_dir }}/{{ uc_containers_prepare_file }}"
+  register: custom_uc_containers
+
+- name: "Remove stein registry parameters from {{ uc_containers_prepare_file }}"
+  lineinfile:
+    path: "{{ working_dir }}/{{ uc_containers_prepare_file }}"
+    state: absent
+    line: "      {{ item.key }}:"
+    regexp: "^      {{ item.key }}:"
+  loop: "{{ stein_registry_params | combine(ceph3_registry_params) | dict2items }}"
+  when:
+    - custom_uc_containers.stat.exists
+    - ffu_overcloud_upgrade|bool
+
 - name: run major upgrade converge step
   shell: |
     set -o pipefail