diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-17 14:45:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-17 14:45:57 -0500 |
| commit | ac1b73841a109f6e9f6947434a9e1aca382e61c6 (patch) | |
| tree | 97d4bb53fa6e9e0d961f11b7830593777dd8b52e | |
| parent | 6782fa3c9e01b02e6a29e676f6bbe53d040b9708 (diff) | |
| parent | 03a5504a653879fc8c1ed482146b64eafdccc4da (diff) | |
| download | openshift-ac1b73841a109f6e9f6947434a9e1aca382e61c6.tar.gz openshift-ac1b73841a109f6e9f6947434a9e1aca382e61c6.tar.bz2 openshift-ac1b73841a109f6e9f6947434a9e1aca382e61c6.tar.xz openshift-ac1b73841a109f6e9f6947434a9e1aca382e61c6.zip | |
Merge pull request #2821 from sdodson/disable-origin-repo
Allow users to disable the origin repo creation
| -rw-r--r-- | inventory/byo/hosts.origin.example | 4 | ||||
| -rw-r--r-- | roles/openshift_repos/tasks/main.yaml | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index e769537f9..5a95ecf94 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -634,6 +634,10 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Enable API service auditing, available as of 1.3 #openshift_master_audit_config={"basicAuditEnabled": true} +# Enable origin repos that point at Centos PAAS SIG, defaults to true, only used +# by deployment_type=origin +#openshift_enable_origin_repo=false + # host group for masters [masters] ose3-master[1:3]-ansible.test.example.com diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml index 9be168611..a81867b98 100644 --- a/roles/openshift_repos/tasks/main.yaml +++ b/roles/openshift_repos/tasks/main.yaml @@ -37,6 +37,7 @@ when: ansible_os_family == "RedHat" and ansible_distribution != "Fedora" and openshift_deployment_type == 'origin' and not openshift.common.is_containerized | bool + and openshift_enable_origin_repo | default(true) - name: Configure origin yum repositories RHEL/CentOS copy: @@ -46,3 +47,4 @@ when: ansible_os_family == "RedHat" and ansible_distribution != "Fedora" and openshift_deployment_type == 'origin' and not openshift.common.is_containerized | bool + and openshift_enable_origin_repo | default(true) |