summaryrefslogtreecommitdiffstats
path: root/inventory/byo
diff options
context:
space:
mode:
authorAdam Miller <maxamillion@fedoraproject.org>2016-08-24 10:10:27 -0500
committerAdam Miller <maxamillion@fedoraproject.org>2016-08-24 10:10:27 -0500
commitf70dd0f95564b0f67195edd515ba208d92df0531 (patch)
tree2ae6b3038c3aa7d9f0cdd63f1d100e2d73a33c5a /inventory/byo
parente395341212dea911a2fbc932102ca032057c5ff4 (diff)
downloadopenshift-f70dd0f95564b0f67195edd515ba208d92df0531.tar.gz
openshift-f70dd0f95564b0f67195edd515ba208d92df0531.tar.bz2
openshift-f70dd0f95564b0f67195edd515ba208d92df0531.tar.xz
openshift-f70dd0f95564b0f67195edd515ba208d92df0531.zip
remove fedora origin copr (it's in mainline fedora now), some dnf/yum clean up
Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
Diffstat (limited to 'inventory/byo')
-rw-r--r--inventory/byo/hosts.origin.example4
1 files changed, 0 insertions, 4 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index 8e7883f3b..c6401b2db 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -109,10 +109,6 @@ openshift_release=v1.2
# Origin copr repo
#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'}]
-# Origin Fedora copr repo
-# Use this if you are installing on Fedora
-#openshift_additional_repos=[{'id': 'fedora-openshift-origin-copr', 'name': 'OpenShift Origin COPR for Fedora', 'baseurl': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/fedora-openshift/fedora-$releasever-$basearch/', 'enabled': 1, 'gpgcheck': 1, 'gpgkey': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/fedora-openshift/pubkey.gpg'}]
-
# htpasswd auth
openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}]
# Defining htpasswd users