diff options
| author | David Moreau-Simard <dms@redhat.com> | 2017-06-19 17:04:16 -0400 |
|---|---|---|
| committer | David Moreau-Simard <dms@redhat.com> | 2017-07-23 10:06:52 -0400 |
| commit | b48887efc53b3757c6f179f1bfef2459b954a957 (patch) | |
| tree | 14bcf18f7c2755f06ee45484d7a31e4787fcdb64 /inventory | |
| parent | 2a706ad80a4286afc4fe5a1cc0cadab302bc7291 (diff) | |
| download | openshift-b48887efc53b3757c6f179f1bfef2459b954a957.tar.gz openshift-b48887efc53b3757c6f179f1bfef2459b954a957.tar.bz2 openshift-b48887efc53b3757c6f179f1bfef2459b954a957.tar.xz openshift-b48887efc53b3757c6f179f1bfef2459b954a957.zip | |
Support enabling the centos-openshift-origin-testing repository
New versions of Origin land in the -testing repository before they
are tagged for release. This effectively adds the ability to easily
test a new unreleased version (currently in this case 1.5.1) by
enabling the correct repository if 'openshift_repos_enable_testing'
is true.
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/byo/hosts.origin.example | 3 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 6e53b4fd9..ff2bdb0c5 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -156,8 +156,9 @@ openshift_release=v3.6 # modify image streams to point at that registry by setting the following to true #openshift_examples_modify_imagestreams=true -# Origin copr repo +# OpenShift repository configuration #openshift_additional_repos=[{'id': 'openshift-origin-copr', 'name': 'OpenShift Origin COPR', 'baseurl': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/epel-7-$basearch/', 'enabled': 1, 'gpgcheck': 1, 'gpgkey': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/pubkey.gpg'}] +#openshift_repos_enable_testing=false # htpasswd auth openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}] diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index e3e9220fc..68639eebf 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -155,8 +155,9 @@ openshift_release=v3.6 # modify image streams to point at that registry by setting the following to true #openshift_examples_modify_imagestreams=true -# Additional yum repos to install +# OpenShift repository configuration #openshift_additional_repos=[{'id': 'ose-devel', 'name': 'ose-devel', 'baseurl': 'http://example.com/puddle/build/AtomicOpenShift/3.1/latest/RH7-RHOSE-3.0/$basearch/os', 'enabled': 1, 'gpgcheck': 0}] +#openshift_repos_enable_testing=false # htpasswd auth openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}] |