Merge "Skip cdn repo for deployment with custom repo's only"

infrared/common/roles/cdn_registery/defaults/main.yml

@@ -3,6 +3,9 @@ subscriptions:
         - rhel-7-server-rpms
         - rhel-7-server-extras-rpms
         - rhel-7-server-rh-common-rpms
+    13:
+        - rhel-ha-for-rhel-7-server-rpms
+        - rhel-7-server-openstack-beta-rpms
     12:
         - rhel-ha-for-rhel-7-server-rpms
         - rhel-7-server-openstack-12-rpms
@@ -21,3 +24,4 @@ subscriptions:
     7:
         - rhel-7-server-openstack-7.0-rpms
         - rhel-7-server-openstack-7.0-director-rpms
+cdn_skip_openstack_repos: "{{ skip_release|default(false) }}"

infrared/common/roles/cdn_registery/tasks/main.yml

@@ -9,7 +9,7 @@
 
 - name: register to openstack repos
   vars:
-      repo_list: "{{ subscriptions.common + subscriptions[install_version|openstack_release] }}"
+      repo_list: "{{ subscriptions.common + (subscriptions[install_version|openstack_release] if not cdn_skip_openstack_repos else []) }}"
       modified_list: "{{ repo_list | map('regex_replace', '(.*)', '--enable=\\1') | join(' ') }}"
   command: "subscription-manager repos {{ modified_list }}"
 

plugins/tripleo-undercloud/plugin.spec

@@ -203,7 +203,8 @@ subparsers:
                       type: Bool
                       help: |
                           specifies whether the rhos/rdo-release tools should
-                          be used to install tripleo packages.
+                          be used to install tripleo packages. This flag also disables installation of the extra cdn
+                          repositories.
                   skip-remove-repo:
                       type: Value
                       action: append