Merge "Overcloud do not expect old args"

redhat-openstack · Oct 20, 2020 · 1e34d13 · 1e34d13
2 parents 2375021 + ce143ba
commit 1e34d13
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git 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
@@ -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: