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

[openshift-ansible] update kickstart ip for iad2 and correct jinja if statement for templates

Browse source
This commit is contained in:
Mark O'Brien 2020-05-12 21:47:28 +01:00 • committed by mobrien
parent 2a9bd7f39a
commit 6be4af965a
10 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inventory/host_vars/os-control01.iad2.fedoraproject.org
View file

@ -3,8 +3,8 @@ nm: 255.255.255.0
gw: 10.3.163.254 gw: 10.3.163.254
dns: 10.3.163.33 dns: 10.3.163.33
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7
ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
volgroup: /dev/vg_guests volgroup: /dev/vg_guests
eth0_ip: 10.3.163.65 eth0_ip: 10.3.163.65

4
inventory/host_vars/os-master01.iad2.fedoraproject.org
View file

@ -3,8 +3,8 @@ nm: 255.255.255.0
gw: 10.3.163.254 gw: 10.3.163.254
dns: 10.3.163.33 dns: 10.3.163.33
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7
ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
volgroup: /dev/vg_guests volgroup: /dev/vg_guests
eth0_ip: 10.3.163.65 eth0_ip: 10.3.163.65

4
inventory/host_vars/os-master02.iad2.fedoraproject.org
View file

@ -3,8 +3,8 @@ nm: 255.255.255.0
gw: 10.3.163.254 gw: 10.3.163.254
dns: 10.3.163.33 dns: 10.3.163.33
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7
ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
volgroup: /dev/vg_guests volgroup: /dev/vg_guests
eth0_ip: 10.3.163.65 eth0_ip: 10.3.163.65

4
inventory/host_vars/os-master03.iad2.fedoraproject.org
View file

@ -3,8 +3,8 @@ nm: 255.255.255.0
gw: 10.3.163.254 gw: 10.3.163.254
dns: 10.3.163.33 dns: 10.3.163.33
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7
ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
volgroup: /dev/vg_guests volgroup: /dev/vg_guests
eth0_ip: 10.3.163.65 eth0_ip: 10.3.163.65

4
inventory/host_vars/os-node01.iad2.fedoraproject.org
View file

@ -3,8 +3,8 @@ nm: 255.255.255.0
gw: 10.3.163.254 gw: 10.3.163.254
dns: 10.3.163.33 dns: 10.3.163.33
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7
ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
volgroup: /dev/vg_guests volgroup: /dev/vg_guests
eth0_ip: 10.3.163.65 eth0_ip: 10.3.163.65

4
inventory/host_vars/os-node02.iad2.fedoraproject.org
View file

@ -3,8 +3,8 @@ nm: 255.255.255.0
gw: 10.3.163.254 gw: 10.3.163.254
dns: 10.3.163.33 dns: 10.3.163.33
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7
ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
volgroup: /dev/vg_guests volgroup: /dev/vg_guests
eth0_ip: 10.3.163.65 eth0_ip: 10.3.163.65

4
inventory/host_vars/os-node03.iad2.fedoraproject.org
View file

@ -3,8 +3,8 @@ nm: 255.255.255.0
gw: 10.3.163.254 gw: 10.3.163.254
dns: 10.3.163.33 dns: 10.3.163.33
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7
ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
volgroup: /dev/vg_guests volgroup: /dev/vg_guests
eth0_ip: 10.3.163.65 eth0_ip: 10.3.163.65

4
inventory/host_vars/os-node04.iad2.fedoraproject.org
View file

@ -3,8 +3,8 @@ nm: 255.255.255.0
gw: 10.3.163.254 gw: 10.3.163.254
dns: 10.3.163.33 dns: 10.3.163.33
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7
ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
volgroup: /dev/vg_guests volgroup: /dev/vg_guests
eth0_ip: 10.3.163.65 eth0_ip: 10.3.163.65

4
inventory/host_vars/os-node05.iad2.fedoraproject.org
View file

@ -3,8 +3,8 @@ nm: 255.255.255.0
gw: 10.3.163.254 gw: 10.3.163.254
dns: 10.3.163.33 dns: 10.3.163.33
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7
ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
volgroup: /dev/vg_guests volgroup: /dev/vg_guests
eth0_ip: 10.3.163.65 eth0_ip: 10.3.163.65

10
roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-prod.j2
View file

@ -515,25 +515,23 @@ openshift_master_identity_providers=[{"name": "fedoraidp", "login": "true", "cha
#openshift_hosted_registry_storage_nfs_directory=/exports #openshift_hosted_registry_storage_nfs_directory=/exports
#openshift_hosted_registry_storage_volume_name=registry #openshift_hosted_registry_storage_volume_name=registry
#openshift_hosted_registry_storage_volume_size=10Gi #openshift_hosted_registry_storage_volume_size=10Gi
{% if datacenter != 'iad2' %}
{% if env == "staging" %} {% if env == "staging" %}
openshift_hosted_registry_storage_kind=nfs openshift_hosted_registry_storage_kind=nfs
openshift_hosted_registry_storage_access_modes=['ReadWriteMany'] openshift_hosted_registry_storage_access_modes=['ReadWriteMany']
{% if datacenter == 'phx2' %}
openshift_hosted_registry_storage_host=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com openshift_hosted_registry_storage_host=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com
{% endif %}
openshift_hosted_registry_storage_nfs_directory=/ openshift_hosted_registry_storage_nfs_directory=/
openshift_hosted_registry_storage_volume_name=openshift-stg-registry openshift_hosted_registry_storage_volume_name=openshift-stg-registry
openshift_hosted_registry_storage_volume_size=10Gi openshift_hosted_registry_storage_volume_size=10Gi
{% else %} {% else %}
openshift_hosted_registry_storage_kind=nfs openshift_hosted_registry_storage_kind=nfs
openshift_hosted_registry_storage_access_modes=['ReadWriteMany'] openshift_hosted_registry_storage_access_modes=['ReadWriteMany']
{% if datacenter == 'phx2' %}
openshift_hosted_registry_storage_host=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com openshift_hosted_registry_storage_host=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com
{% endif %}
openshift_hosted_registry_storage_nfs_directory=/ openshift_hosted_registry_storage_nfs_directory=/
openshift_hosted_registry_storage_volume_name=openshift-prod-registry openshift_hosted_registry_storage_volume_name=openshift-prod-registry
openshift_hosted_registry_storage_volume_size=10Gi openshift_hosted_registry_storage_volume_size=10Gi
{% endif %} {% endif %}
{% endif %}
# #
# Openstack # Openstack
# Volume must already exist. # Volume must already exist.
@ -721,14 +719,14 @@ openshift_logging_es_nodeselector={"node-role.kubernetes.io/infra":"true"}
#openshift_logging_storage_volume_name=logging #openshift_logging_storage_volume_name=logging
#openshift_logging_storage_volume_size=10Gi #openshift_logging_storage_volume_size=10Gi
#openshift_logging_storage_labels={'storage': 'logging'} #openshift_logging_storage_labels={'storage': 'logging'}
{% if datacenter != 'iad2' %}
openshift_logging_storage_kind=nfs openshift_logging_storage_kind=nfs
openshift_logging_storage_access_modes=['ReadWriteOnce'] openshift_logging_storage_access_modes=['ReadWriteOnce']
{% if datacenter == 'phx2' %}
openshift_logging_storage_host=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com openshift_logging_storage_host=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com
{% endif %}
openshift_logging_storage_nfs_directory=/ openshift_logging_storage_nfs_directory=/
openshift_logging_storage_volume_name=openshift-prod-logging openshift_logging_storage_volume_name=openshift-prod-logging
openshift_logging_storage_volume_size=100Gi openshift_logging_storage_volume_size=100Gi
{% endif %}
# #
# Option C - Dynamic -- If openshift supports dynamic volume provisioning for # Option C - Dynamic -- If openshift supports dynamic volume provisioning for
# your cloud platform use this. # your cloud platform use this.