Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

[osbs-iad2] add registry for iad2 and add openshift_version vars

Browse source
This commit is contained in:
Mark O'Brien 2020-06-04 15:22:55 +01:00
parent 0339781ad3
commit 67a99cb6e3
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
playbooks/groups/osbs/deploy-cluster.yml
View file

@ -272,6 +272,7 @@
openshift_htpasswd_file: "/etc/origin/htpasswd"
openshift_master_public_api_url: "https://{{ osbs_url }}:8443"
openshift_release: "v3.11"
openshift_version: "v3.11"
openshift_ansible_path: "/root/openshift-ansible"
openshift_ansible_pre_playbook: "playbooks/prerequisites.yml"
openshift_ansible_playbook: "playbooks/deploy_cluster.yml"

8
roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-osbs.j2
View file

@ -55,6 +55,7 @@ deployment_type={{openshift_deployment_type}}
# the cluster. For RPM installations we just verify the version detected in your configured repos matches this
# release.
openshift_release={{openshift_release}}
openshift_version={{openshift_version}}
# For whatever reason, this keeps hitting a race condition and docker is
# excluded before docker is installed so we're just going to remove it.
@ -225,6 +226,7 @@ openshift_master_identity_providers=[{"name": "fedoraidp", "login": "true", "cha
openshift_master_identity_providers=[{"name": "fedoraidp", "login": "true", "challenge": "false", "kind": "OpenIDIdentityProvider", "client_id": "openshift", "client_secret": "{{openshift_stg_client_secret}}", "claims": {"id": ["sub"], "preferredUsername": ["sub"], "name": ["name"], "email": ["email"]}, "urls": {"authorize": "https://id{{env_suffix}}.fedoraproject.org/openidc/Authorization", "token": "https://id{{env_suffix}}.fedoraproject.org/openidc/Token", "userInfo": "https://id{{env_suffix}}.fedoraproject.org/openidc/UserInfo"}}]
{% endif %}
# If oreg_url points to a registry requiring authentication, provide the following:
{% if openshift_arch == "aarch64" %}
oreg_url=quay.io/multi-arch/aarch64-openshift3-ose-${component}:${version}
@ -234,10 +236,14 @@ oreg_test_login=false
{% elif env == "staging" %}
oreg_auth_user="{{ os_stg_registry_user }}"
oreg_auth_password="{{ os_stg_registry_password }}"
{% else %}
{% elif datacenter != 'iad2' %}
oreg_auth_user="{{ os_prod_registry_user }}"
oreg_auth_password="{{ os_prod_registry_password }}"
{% else %}
oreg_auth_user="{{ os_prod_iad2_registry_user }}"
oreg_auth_password="{{ os_prod_iad2_registry_password }}"
{% endif %}
# NOTE: oreg_url must be defined by the user for oreg_auth_* to have any affect.
# oreg_auth_pass should be generated from running docker login.
# To update registry auth credentials, uncomment the following: