From 6be4af965aef7a74f503d2fcf2391551e7ba9a75 Mon Sep 17 00:00:00 2001 From: Mark O'Brien Date: Tue, 12 May 2020 21:47:28 +0100 Subject: [PATCH] [openshift-ansible] update kickstart ip for iad2 and correct jinja if statement for templates --- .../host_vars/os-control01.iad2.fedoraproject.org | 4 ++-- inventory/host_vars/os-master01.iad2.fedoraproject.org | 4 ++-- inventory/host_vars/os-master02.iad2.fedoraproject.org | 4 ++-- inventory/host_vars/os-master03.iad2.fedoraproject.org | 4 ++-- inventory/host_vars/os-node01.iad2.fedoraproject.org | 4 ++-- inventory/host_vars/os-node02.iad2.fedoraproject.org | 4 ++-- inventory/host_vars/os-node03.iad2.fedoraproject.org | 4 ++-- inventory/host_vars/os-node04.iad2.fedoraproject.org | 4 ++-- inventory/host_vars/os-node05.iad2.fedoraproject.org | 4 ++-- .../templates/cluster-inventory-prod.j2 | 10 ++++------ 10 files changed, 22 insertions(+), 24 deletions(-) diff --git a/inventory/host_vars/os-control01.iad2.fedoraproject.org b/inventory/host_vars/os-control01.iad2.fedoraproject.org index ea3562de7e..a1511779c7 100644 --- a/inventory/host_vars/os-control01.iad2.fedoraproject.org +++ b/inventory/host_vars/os-control01.iad2.fedoraproject.org @@ -3,8 +3,8 @@ nm: 255.255.255.0 gw: 10.3.163.254 dns: 10.3.163.33 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.3.163.65 diff --git a/inventory/host_vars/os-master01.iad2.fedoraproject.org b/inventory/host_vars/os-master01.iad2.fedoraproject.org index 8c64ff4e16..8d54446047 100644 --- a/inventory/host_vars/os-master01.iad2.fedoraproject.org +++ b/inventory/host_vars/os-master01.iad2.fedoraproject.org @@ -3,8 +3,8 @@ nm: 255.255.255.0 gw: 10.3.163.254 dns: 10.3.163.33 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.3.163.65 diff --git a/inventory/host_vars/os-master02.iad2.fedoraproject.org b/inventory/host_vars/os-master02.iad2.fedoraproject.org index 05db13e63b..78df10c1ca 100644 --- a/inventory/host_vars/os-master02.iad2.fedoraproject.org +++ b/inventory/host_vars/os-master02.iad2.fedoraproject.org @@ -3,8 +3,8 @@ nm: 255.255.255.0 gw: 10.3.163.254 dns: 10.3.163.33 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.3.163.65 diff --git a/inventory/host_vars/os-master03.iad2.fedoraproject.org b/inventory/host_vars/os-master03.iad2.fedoraproject.org index 81703dc713..48a08c6770 100644 --- a/inventory/host_vars/os-master03.iad2.fedoraproject.org +++ b/inventory/host_vars/os-master03.iad2.fedoraproject.org @@ -3,8 +3,8 @@ nm: 255.255.255.0 gw: 10.3.163.254 dns: 10.3.163.33 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.3.163.65 diff --git a/inventory/host_vars/os-node01.iad2.fedoraproject.org b/inventory/host_vars/os-node01.iad2.fedoraproject.org index 106281cc47..2b6d5f3e7e 100644 --- a/inventory/host_vars/os-node01.iad2.fedoraproject.org +++ b/inventory/host_vars/os-node01.iad2.fedoraproject.org @@ -3,8 +3,8 @@ nm: 255.255.255.0 gw: 10.3.163.254 dns: 10.3.163.33 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.3.163.65 diff --git a/inventory/host_vars/os-node02.iad2.fedoraproject.org b/inventory/host_vars/os-node02.iad2.fedoraproject.org index 463173b50d..c23158b4b7 100644 --- a/inventory/host_vars/os-node02.iad2.fedoraproject.org +++ b/inventory/host_vars/os-node02.iad2.fedoraproject.org @@ -3,8 +3,8 @@ nm: 255.255.255.0 gw: 10.3.163.254 dns: 10.3.163.33 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.3.163.65 diff --git a/inventory/host_vars/os-node03.iad2.fedoraproject.org b/inventory/host_vars/os-node03.iad2.fedoraproject.org index 7227b0bdfe..f27a4da061 100644 --- a/inventory/host_vars/os-node03.iad2.fedoraproject.org +++ b/inventory/host_vars/os-node03.iad2.fedoraproject.org @@ -3,8 +3,8 @@ nm: 255.255.255.0 gw: 10.3.163.254 dns: 10.3.163.33 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.3.163.65 diff --git a/inventory/host_vars/os-node04.iad2.fedoraproject.org b/inventory/host_vars/os-node04.iad2.fedoraproject.org index ea3562de7e..a1511779c7 100644 --- a/inventory/host_vars/os-node04.iad2.fedoraproject.org +++ b/inventory/host_vars/os-node04.iad2.fedoraproject.org @@ -3,8 +3,8 @@ nm: 255.255.255.0 gw: 10.3.163.254 dns: 10.3.163.33 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.3.163.65 diff --git a/inventory/host_vars/os-node05.iad2.fedoraproject.org b/inventory/host_vars/os-node05.iad2.fedoraproject.org index 8c64ff4e16..8d54446047 100644 --- a/inventory/host_vars/os-node05.iad2.fedoraproject.org +++ b/inventory/host_vars/os-node05.iad2.fedoraproject.org @@ -3,8 +3,8 @@ nm: 255.255.255.0 gw: 10.3.163.254 dns: 10.3.163.33 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.3.163.65 diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-prod.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-prod.j2 index 430e095d77..919ec858cb 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-prod.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-prod.j2 @@ -515,25 +515,23 @@ openshift_master_identity_providers=[{"name": "fedoraidp", "login": "true", "cha #openshift_hosted_registry_storage_nfs_directory=/exports #openshift_hosted_registry_storage_volume_name=registry #openshift_hosted_registry_storage_volume_size=10Gi +{% if datacenter != 'iad2' %} {% if env == "staging" %} openshift_hosted_registry_storage_kind=nfs openshift_hosted_registry_storage_access_modes=['ReadWriteMany'] -{% if datacenter == 'phx2' %} 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_volume_name=openshift-stg-registry openshift_hosted_registry_storage_volume_size=10Gi {% else %} openshift_hosted_registry_storage_kind=nfs openshift_hosted_registry_storage_access_modes=['ReadWriteMany'] -{% if datacenter == 'phx2' %} 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_volume_name=openshift-prod-registry openshift_hosted_registry_storage_volume_size=10Gi {% endif %} +{% endif %} # # Openstack # 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_size=10Gi #openshift_logging_storage_labels={'storage': 'logging'} +{% if datacenter != 'iad2' %} openshift_logging_storage_kind=nfs openshift_logging_storage_access_modes=['ReadWriteOnce'] -{% if datacenter == 'phx2' %} openshift_logging_storage_host=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com -{% endif %} openshift_logging_storage_nfs_directory=/ openshift_logging_storage_volume_name=openshift-prod-logging openshift_logging_storage_volume_size=100Gi +{% endif %} # # Option C - Dynamic -- If openshift supports dynamic volume provisioning for # your cloud platform use this.