diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-03 16:01:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-03 16:01:11 -0400 |
| commit | 7beb8e3454bc710110166179d10a2119b8b091ec (patch) | |
| tree | b252354649cd886d72419bfff80e03a6428aee88 | |
| parent | bb10c3ee0ae4736b5e5c912592654baad07f8203 (diff) | |
| parent | cb24c6d98b7f5c5d528a8ccd003b1668b42663b6 (diff) | |
| download | openshift-7beb8e3454bc710110166179d10a2119b8b091ec.tar.gz openshift-7beb8e3454bc710110166179d10a2119b8b091ec.tar.bz2 openshift-7beb8e3454bc710110166179d10a2119b8b091ec.tar.xz openshift-7beb8e3454bc710110166179d10a2119b8b091ec.zip | |
Merge pull request #2255 from abutcher/hosted-knobs
Add knobs for disabling router/registry management.
| -rw-r--r-- | inventory/byo/hosts.origin.example | 6 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 6 | ||||
| -rw-r--r-- | roles/openshift_hosted/tasks/main.yml | 3 |
3 files changed, 15 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 115ddb824..023e1a3a6 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -259,6 +259,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Provide local certificate paths which will be configured as the # router's default certificate. #openshift_hosted_router_certificate={"certfile": "/path/to/router.crt", "keyfile": "/path/to/router.key", "cafile": "/path/to/router-ca.crt"} +# +# Disable management of the OpenShift Router +#openshift_hosted_manage_router=false # Openshift Registry Options # @@ -280,6 +283,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Unless specified, openshift-ansible will calculate the replica count # based on the number of nodes matching the openshift registry selector. #openshift_hosted_registry_replicas=2 +# +# Disable management of the OpenShift Registry +#openshift_hosted_manage_registry=false # Registry Storage Options # diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index b036165be..8e1a9c139 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -253,6 +253,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Provide local certificate paths which will be configured as the # router's default certificate. #openshift_hosted_router_certificate={"certfile": "/path/to/router.crt", "keyfile": "/path/to/router.key", "cafile": "/path/to/router-ca.crt"} +# +# Disable management of the OpenShift Router +#openshift_hosted_manage_router=false # Openshift Registry Options # @@ -274,6 +277,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Unless specified, openshift-ansible will calculate the replica count # based on the number of nodes matching the openshift registry selector. #openshift_hosted_registry_replicas=2 +# +# Disable management of the OpenShift Registry +#openshift_hosted_manage_registry=false # Registry Storage Options # diff --git a/roles/openshift_hosted/tasks/main.yml b/roles/openshift_hosted/tasks/main.yml index c801a0e67..67c6bbfd7 100644 --- a/roles/openshift_hosted/tasks/main.yml +++ b/roles/openshift_hosted/tasks/main.yml @@ -13,7 +13,10 @@ changed_when: False - include: router/router.yml + when: openshift_hosted_manage_router | default(true) | bool + - include: registry/registry.yml + when: openshift_hosted_manage_registry | default(true) | bool - name: Delete temp directory file: |