diff options
| author | Adam Miller <admiller@redhat.com> | 2015-11-18 16:19:19 -0600 |
|---|---|---|
| committer | Adam Miller <admiller@redhat.com> | 2015-12-02 14:55:29 -0600 |
| commit | af009a7a51d7b6f5799a14c452cc7db92727135e (patch) | |
| tree | afe2cebb1e98aa52fdf9bc21f03ebdaf4aa27bdc /inventory/byo | |
| parent | ebf659b0c1775f9be3e52a8ef420d568656c10f9 (diff) | |
| download | openshift-af009a7a51d7b6f5799a14c452cc7db92727135e.tar.gz openshift-af009a7a51d7b6f5799a14c452cc7db92727135e.tar.bz2 openshift-af009a7a51d7b6f5799a14c452cc7db92727135e.tar.xz openshift-af009a7a51d7b6f5799a14c452cc7db92727135e.zip | |
Fedora changes:
- ansible bootstrap playbook for Fedora 23+
- add conditionals to handle yum vs dnf
- add Fedora OpenShift COPR
- update BYO host README for repo configs and fedora bootstrap
Fix typo in etcd README, remove unnecessary parens in openshift_node main.yml
rebase on master, update package cache refresh handler for yum vs dnf
Fix typo in etcd README, remove unnecessary parens in openshift_node main.yml
Diffstat (limited to 'inventory/byo')
| -rw-r--r-- | inventory/byo/hosts.example | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/inventory/byo/hosts.example b/inventory/byo/hosts.example index 1a67cc290..29d81d64f 100644 --- a/inventory/byo/hosts.example +++ b/inventory/byo/hosts.example @@ -36,6 +36,10 @@ deployment_type=atomic-enterprise # 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/openshift/htpasswd'}] |