diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-03 22:39:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-03 22:39:31 -0400 |
| commit | 34f5de4185b0ae475367e9316a44bdf58fce1dc9 (patch) | |
| tree | 0cf41a3ab73363907e3014f30170f8a3bab6058f | |
| parent | 50f63b2c5d1c9bcbd6d11fcad68813735ab8f6db (diff) | |
| parent | ec6714080e7b77a64b974cef78a0c102fbbb566b (diff) | |
| download | openshift-34f5de4185b0ae475367e9316a44bdf58fce1dc9.tar.gz openshift-34f5de4185b0ae475367e9316a44bdf58fce1dc9.tar.bz2 openshift-34f5de4185b0ae475367e9316a44bdf58fce1dc9.tar.xz openshift-34f5de4185b0ae475367e9316a44bdf58fce1dc9.zip | |
Merge pull request #2116 from skpy/master
Adds quotes to gpgkey element in byo/config.yml
| -rw-r--r-- | inventory/byo/hosts.origin.example | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index ef5488d67..9cb6b3740 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -82,11 +82,11 @@ deployment_type=origin #oreg_url=example.com/openshift3/ose-${component}:${version} # 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'}] +#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'}] +#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'}] |