Skip to content

Commit

Permalink
Skip cdn repo for deployment with custom repo's only
Browse files Browse the repository at this point in the history
For some deployment we need to use just custom repo's provided.
For such cases we need to also skip adding cdn extra repos when
system is registered with cdn.

To do that the --repos-skip-release option is now can be used.

RHOSINFRA-1842

Change-Id: I8ebd38dc5db7d17bdf610d60a19e88f8f4afd1ac
  • Loading branch information
obaranov committed Jun 6, 2018
1 parent fe49264 commit 07baf37
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions infrared/common/roles/cdn_registery/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) }}"
2 changes: 1 addition & 1 deletion infrared/common/roles/cdn_registery/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"

Expand Down
3 changes: 2 additions & 1 deletion plugins/tripleo-undercloud/plugin.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 07baf37

Please sign in to comment.