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

metrics-for-apps: Reverting recent changes

Browse source
This commit is contained in:
David Kirwan 2021-08-06 22:45:22 +09:00
parent a1a8c5405c
commit 46d54fbb35
5 changed files with 3 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/host_vars/ocp01.ocp.stg.iad2.fedoraproject.org
View file

@ -25,7 +25,7 @@ nm: 255.255.255.0
gw: "{{ eth0_ipv4_gw }}" gw: "{{ eth0_ipv4_gw }}"
dns: "{{ dns1 }}" dns: "{{ dns1 }}"
mac0: "52:54:00:CE:A2:AC" mac0: "{{ ansible_default_ipv4.macaddress }}"
rhcos_ignition_file_url: "http://10.3.166.50/rhcos/controlplane.ign" rhcos_ignition_file_url: "http://10.3.166.50/rhcos/controlplane.ign"
rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz"

2
inventory/host_vars/ocp02.ocp.stg.iad2.fedoraproject.org
View file

@ -25,7 +25,7 @@ nm: 255.255.255.0
gw: "{{ eth0_ipv4_gw }}" gw: "{{ eth0_ipv4_gw }}"
dns: "{{ dns1 }}" dns: "{{ dns1 }}"
mac0: "52:54:00:CE:A3:24" mac0: "{{ ansible_default_ipv4.macaddress }}"
rhcos_ignition_file_url: "http://10.3.166.50/rhcos/controlplane.ign" rhcos_ignition_file_url: "http://10.3.166.50/rhcos/controlplane.ign"
rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz"

2
inventory/host_vars/ocp03.ocp.stg.iad2.fedoraproject.org
View file

@ -25,7 +25,7 @@ nm: 255.255.255.0
gw: "{{ eth0_ipv4_gw }}" gw: "{{ eth0_ipv4_gw }}"
dns: "{{ dns1 }}" dns: "{{ dns1 }}"
mac0: "52:54:00:CE:A5:10" mac0: "{{ ansible_default_ipv4.macaddress }}"
rhcos_ignition_file_url: "http://10.3.166.50/rhcos/controlplane.ign" rhcos_ignition_file_url: "http://10.3.166.50/rhcos/controlplane.ign"
rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz"

1
playbooks/manual/ocp4-place-ignitionfiles.yml
View file

@ -18,7 +18,6 @@
# deploy_host: # http server serving ignition files # deploy_host: # http server serving ignition files
- hosts: os_control_stg:ocp_controlplane_stg:ocp_workers_stg:ocp_boostrap_stg:ocp_vms_stg - hosts: os_control_stg:ocp_controlplane_stg:ocp_workers_stg:ocp_boostrap_stg:ocp_vms_stg
user: root user: root
gather_facts: false
tasks: tasks:
- block: - block:

21
roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
View file

@ -549,27 +549,6 @@ host centos01 {
} }
# Staging network # Staging network
host ocp01-ocp-stg {
hardware ethernet 52:54:00:CE:A2:AC;
fixed-address 10.3.166.115;
next-server 10.3.163.10;
option routers 10.3.166.254;
option subnet-mask 255.255.255.0;
}
host ocp02-ocp-stg {
hardware ethernet 52:54:00:CE:A3:24;
fixed-address 10.3.166.116;
next-server 10.3.163.10;
option routers 10.3.166.254;
option subnet-mask 255.255.255.0;
}
host ocp03-ocp-stg {
hardware ethernet 52:54:00:CE:A5:10;
fixed-address 10.3.166.117;
next-server 10.3.163.10;
option routers 10.3.166.254;
option subnet-mask 255.255.255.0;
}
host worker01-ocp-stg { host worker01-ocp-stg {
hardware ethernet 68:05:CA:CE:A2:AC; hardware ethernet 68:05:CA:CE:A2:AC;
fixed-address 10.3.166.118; fixed-address 10.3.166.118;