ocp-ha-disco: more disco hits in inventory

Judd Maltin

2019-04-02 23e8d65cc5729cd34cde6615aebfdd026f89119e

ocp-ha-disco: more disco hits in inventory

 ansible/configs/ocp-ha-disconnected-lab/files/hosts_template.3.11.59.j2

@@ -27,7 +27,7 @@
openshift_image_tag=v{{ osrelease }}
# Use this variable to specify an RPM version to install or configure.
openshift_pkg_version=-{{ osrelease }}
openshift_release={{ osrelease }}
openshift_release="{{ osrelease }}"

{% if container_runtime == "cri-o" %}
openshift_use_crio=True
@@ -57,6 +57,8 @@
#oreg_auth_password={{ redhat_registry_password }}

openshift_docker_insecure_registries=isolated1.{{ guid }}.internal:5000
openshift_docker_blocked_registries=registry.redhat.io,registry.access.redhat.com,docker.io
# openshift_docker_additional_registries=

# For Operator Framework Images
# openshift_additional_registry_credentials=[{'host':'registry.connect.redhat.com','user':'{{ redhat_registry_user }}','password':'{{ redhat_registry_password }}','test_image':'mongodb/enterprise-operator:0.3.2'}]
@@ -149,7 +151,6 @@
###########################################################################
### OpenShift Authentication Vars
###########################################################################


# LDAP AND HTPASSWD Authentication (download ipa-ca.crt first)
#openshift_master_identity_providers=[{'name': 'ldap', 'challenge': 'true', 'login': 'true', 'kind': 'LDAPPasswordIdentityProvider','attributes': {'id': ['dn'], 'email': ['mail'], 'name': ['cn'], 'preferredUsername': ['uid']}, 'bindDN': 'uid=admin,cn=users,cn=accounts,dc=shared,dc=example,dc=opentlc,dc=com', 'bindPassword': 'r3dh4t1!', 'ca': '/etc/origin/master/ipa-ca.crt','insecure': 'false', 'url': 'ldaps://ipa.shared.example.opentlc.com:636/cn=users,cn=accounts,dc=shared,dc=example,dc=opentlc,dc=com?uid?sub?(memberOf=cn=ocp-users,cn=groups,cn=accounts,dc=shared,dc=example,dc=opentlc,dc=com)'},{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider'}]

 ansible/configs/ocp-ha-disconnected-lab/files/labs_hosts_template.3.11.59.j2

@@ -56,6 +56,10 @@
oreg_auth_user=
oreg_auth_password=

openshift_docker_insecure_registries=
openshift_docker_blocked_registries=
openshift_docker_additional_registries=

# For Operator Framework Images
openshift_additional_registry_credentials=