summaryrefslogtreecommitdiffstats
path: root/inventory
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-01-09 13:40:36 -0500
committerGitHub <noreply@github.com>2018-01-09 13:40:36 -0500
commit25f31c4c472807ad504abcba41a423895e9838d7 (patch)
treeb832e7e1639b5b10da9306d37d75a8634c4947f2 /inventory
parent0e38305063e1b4322425a42a0f5eaaa788d7fb23 (diff)
parentdaf331ab053de1e685b2fa9ca62a5c9f7381edc0 (diff)
downloadopenshift-25f31c4c472807ad504abcba41a423895e9838d7.tar.gz
openshift-25f31c4c472807ad504abcba41a423895e9838d7.tar.bz2
openshift-25f31c4c472807ad504abcba41a423895e9838d7.tar.xz
openshift-25f31c4c472807ad504abcba41a423895e9838d7.zip
Merge pull request #6618 from ture-karlsson/master
Provide example on how to use osm_etcd_image
Diffstat (limited to 'inventory')
-rw-r--r--inventory/hosts.example4
1 files changed, 4 insertions, 0 deletions
diff --git a/inventory/hosts.example b/inventory/hosts.example
index 8c2590078..05293269d 100644
--- a/inventory/hosts.example
+++ b/inventory/hosts.example
@@ -197,6 +197,10 @@ openshift_release=v3.7
#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
+# If the image for etcd needs to be pulled from anywhere else than registry.access.redhat.com, e.g. in
+# a disconnected and containerized installation, use osm_etcd_image to specify the image to use:
+#osm_etcd_image=rhel7/etcd
+
# htpasswd auth
openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}]
# Defining htpasswd users