From ce143ba84fbdb6c044a2a6c5f5de32693571bbf5 Mon Sep 17 00:00:00 2001
From: afazekas <afazekas@redhat.com>
Date: Mon, 10 Aug 2020 13:09:37 +0200
Subject: [PATCH] Overcloud do not expect old args

registry-skip-puddle assumes cdn usage however it is not the
only case when you may skip puddle.
The option originally used only to try avoid rhos-release usage
or depending on it's side effects.

Since both the undercloud and overcloud containerized,
we can simple have overcloud to use the underclouds registry
without insisting on passing any extra override options, so
this change allows to not pass unnecessary arguments, if the
user only intention is to skip puddle related tool usage.

Change-Id: I3684d3a8d5deb93ee25b939a1983c07b74ea7c9a
---
 plugins/tripleo-overcloud/plugin.spec                 |  8 ++++----
 .../roles/containers/prepare-templates/tasks/pre.yml  | 11 +----------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/plugins/tripleo-overcloud/plugin.spec b/plugins/tripleo-overcloud/plugin.spec
index 04942c4395..76a15ea350 100644
--- a/plugins/tripleo-overcloud/plugin.spec
+++ b/plugins/tripleo-overcloud/plugin.spec
@@ -102,8 +102,9 @@ subparsers:
 
                   registry-mirror:
                       type: Value
-                      help: The alternative docker registry to use for deployment.
-                      required_when: "registry-skip-puddle == True"
+                      help: | 
+                          The alternative docker registry to use for deployment. DEPRECATED.
+                          New version of osp handles the registry mirror only at the undercloud step.
 
                   registry-undercloud-skip:
                       type: Bool
@@ -127,8 +128,7 @@ subparsers:
 
                   registry-tag:
                       type: Value
-                      help: The images tag
-                      required_when: "registry-skip-puddle == True"
+                      help: The images tag.
 
                   registry-tag-label:
                       type: Value
diff --git a/plugins/tripleo-overcloud/roles/containers/prepare-templates/tasks/pre.yml b/plugins/tripleo-overcloud/roles/containers/prepare-templates/tasks/pre.yml
index 94d09b6d0a..8a085e5539 100644
--- a/plugins/tripleo-overcloud/roles/containers/prepare-templates/tasks/pre.yml
+++ b/plugins/tripleo-overcloud/roles/containers/prepare-templates/tasks/pre.yml
@@ -49,21 +49,12 @@
           container-image-prepare:
               namespace: "{{ install.get('registry', {}).namespace|default('') }}"
               prefix: "{{ install.registry.prefix|default('') }}"
-              tag: "{{ install.registry.tag }}"
+              tag: "{{ install.registry.tag|default(omit) }}"
               ceph-namespace: "{{ install.get('registry', {}).get('ceph', {}).namespace|default('') }}"
               ceph-image: "{{ install.get('registry', {}).get('ceph', {}).image|default('') }}"
               ceph-tag: "{{ install.get('registry', {}).get('ceph', {}).tag|default('') }}"
   when: install.registry.skip.puddle
 
-- name: Fail non-osp deployment
-  fail:
-      msg: |
-          For non-OSP deployment set --registry-skip-puddle=yes and provide
-          '-registy-namespace' '--registry-tag' options.
-  when:
-      - (install.version|default(undercloud_version)|openstack_distribution) != 'OSP'
-      - container_env is not defined
-
 - block:
     - name: get puddle url from the repos
       vars: