diff --git a/inventory/host_vars/os-control01.iad2.fedoraproject.org b/inventory/host_vars/os-control01.iad2.fedoraproject.org new file mode 100644 index 0000000000..ea3562de7e --- /dev/null +++ b/inventory/host_vars/os-control01.iad2.fedoraproject.org @@ -0,0 +1,14 @@ +--- +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/ + +volgroup: /dev/vg_guests +eth0_ip: 10.3.163.65 +vmhost: vimhost-x86-01.iad2.fedoraproject.org +datacenter: iad2 + +baseiptables: true diff --git a/inventory/host_vars/os-master01.iad2.fedoraproject.org b/inventory/host_vars/os-master01.iad2.fedoraproject.org new file mode 100644 index 0000000000..8c64ff4e16 --- /dev/null +++ b/inventory/host_vars/os-master01.iad2.fedoraproject.org @@ -0,0 +1,14 @@ +--- +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/ + +volgroup: /dev/vg_guests +eth0_ip: 10.3.163.65 +vmhost: vimhost-x86-02.iad2.fedoraproject.org +datacenter: iad2 + +baseiptables: true diff --git a/inventory/host_vars/os-master02.iad2.fedoraproject.org b/inventory/host_vars/os-master02.iad2.fedoraproject.org new file mode 100644 index 0000000000..05db13e63b --- /dev/null +++ b/inventory/host_vars/os-master02.iad2.fedoraproject.org @@ -0,0 +1,14 @@ +--- +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/ + +volgroup: /dev/vg_guests +eth0_ip: 10.3.163.65 +vmhost: vimhost-x86-03.iad2.fedoraproject.org +datacenter: iad2 + +baseiptables: true diff --git a/inventory/host_vars/os-master03.iad2.fedoraproject.org b/inventory/host_vars/os-master03.iad2.fedoraproject.org new file mode 100644 index 0000000000..81703dc713 --- /dev/null +++ b/inventory/host_vars/os-master03.iad2.fedoraproject.org @@ -0,0 +1,14 @@ +--- +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/ + +volgroup: /dev/vg_guests +eth0_ip: 10.3.163.65 +vmhost: vimhost-x86-04.iad2.fedoraproject.org +datacenter: iad2 + +baseiptables: true diff --git a/inventory/host_vars/os-node01.iad2.fedoraproject.org b/inventory/host_vars/os-node01.iad2.fedoraproject.org new file mode 100644 index 0000000000..106281cc47 --- /dev/null +++ b/inventory/host_vars/os-node01.iad2.fedoraproject.org @@ -0,0 +1,14 @@ +--- +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/ + +volgroup: /dev/vg_guests +eth0_ip: 10.3.163.65 +vmhost: vimhost-x86-05.iad2.fedoraproject.org +datacenter: iad2 + +baseiptables: true diff --git a/inventory/host_vars/os-node02.iad2.fedoraproject.org b/inventory/host_vars/os-node02.iad2.fedoraproject.org new file mode 100644 index 0000000000..463173b50d --- /dev/null +++ b/inventory/host_vars/os-node02.iad2.fedoraproject.org @@ -0,0 +1,14 @@ +--- +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/ + +volgroup: /dev/vg_guests +eth0_ip: 10.3.163.65 +vmhost: vimhost-x86-06.iad2.fedoraproject.org +datacenter: iad2 + +baseiptables: true diff --git a/inventory/host_vars/os-node03.iad2.fedoraproject.org b/inventory/host_vars/os-node03.iad2.fedoraproject.org new file mode 100644 index 0000000000..7227b0bdfe --- /dev/null +++ b/inventory/host_vars/os-node03.iad2.fedoraproject.org @@ -0,0 +1,14 @@ +--- +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/ + +volgroup: /dev/vg_guests +eth0_ip: 10.3.163.65 +vmhost: vimhost-x86-07.iad2.fedoraproject.org +datacenter: iad2 + +baseiptables: true diff --git a/inventory/host_vars/os-node04.iad2.fedoraproject.org b/inventory/host_vars/os-node04.iad2.fedoraproject.org new file mode 100644 index 0000000000..ea3562de7e --- /dev/null +++ b/inventory/host_vars/os-node04.iad2.fedoraproject.org @@ -0,0 +1,14 @@ +--- +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/ + +volgroup: /dev/vg_guests +eth0_ip: 10.3.163.65 +vmhost: vimhost-x86-01.iad2.fedoraproject.org +datacenter: iad2 + +baseiptables: true diff --git a/inventory/host_vars/os-node05.iad2.fedoraproject.org b/inventory/host_vars/os-node05.iad2.fedoraproject.org new file mode 100644 index 0000000000..8c64ff4e16 --- /dev/null +++ b/inventory/host_vars/os-node05.iad2.fedoraproject.org @@ -0,0 +1,14 @@ +--- +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/ + +volgroup: /dev/vg_guests +eth0_ip: 10.3.163.65 +vmhost: vimhost-x86-02.iad2.fedoraproject.org +datacenter: iad2 + +baseiptables: true diff --git a/inventory/inventory b/inventory/inventory index ac4bedd152..0b3aee1ef6 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1168,6 +1168,9 @@ os-control01.stg.phx2.fedoraproject.org os-master01.stg.phx2.fedoraproject.org os-master02.stg.phx2.fedoraproject.org os-master03.stg.phx2.fedoraproject.org +os-master01.stg.iad2.fedoraproject.org +os-master02.stg.iad2.fedoraproject.org +os-master03.stg.iad2.fedoraproject.org [os_infra_nodes_stg] os-node01.stg.phx2.fedoraproject.org @@ -1185,6 +1188,7 @@ os_control_stg [os_control] os-control01.phx2.fedoraproject.org +os-control01.iad2.fedoraproject.org [os_masters] os-master01.phx2.fedoraproject.org @@ -1195,10 +1199,15 @@ os-master03.phx2.fedoraproject.org os-node01.phx2.fedoraproject.org os-node02.phx2.fedoraproject.org os-node03.phx2.fedoraproject.org +os-node01.iad2.fedoraproject.org +os-node02.iad2.fedoraproject.org +os-node03.iad2.fedoraproject.org [os_nodes] os-node04.phx2.fedoraproject.org os-node05.phx2.fedoraproject.org +os-node04.iad2.fedoraproject.org +os-node05.iad2.fedoraproject.org [os_nodes:children] os_infra_nodes @@ -1293,6 +1302,15 @@ vmhost-x86-04.iad2.fedoraproject.org vmhost-x86-05.iad2.fedoraproject.org vmhost-x86-06.iad2.fedoraproject.org vmhost-x86-07.iad2.fedoraproject.org +os-control01.iad2.fedoraproject.org +os-master01.iad2.fedoraproject.org +os-master02.iad2.fedoraproject.org +os-master03.iad2.fedoraproject.org +os-node01.iad2.fedoraproject.org +os-node02.iad2.fedoraproject.org +os-node03.iad2.fedoraproject.org +os-node04.iad2.fedoraproject.org +os-node05.iad2.fedoraproject.org [iad2:vars] ansible_group_priority=10 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 f7bbe7381e..430e095d77 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-prod.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-prod.j2 @@ -518,14 +518,18 @@ openshift_master_identity_providers=[{"name": "fedoraidp", "login": "true", "cha {% 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 @@ -719,7 +723,9 @@ openshift_logging_es_nodeselector={"node-role.kubernetes.io/infra":"true"} #openshift_logging_storage_labels={'storage': 'logging'} 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