migrate to new tu teststand ip address space

Puppetfile

@@ -10,7 +10,7 @@ mod 'puppetlabs/accounts', '4.1.0'
 mod 'puppetlabs/translate', '1.2.0'
 mod 'saz/sudo', '6.0.0'
 mod 'puppetlabs/puppet_agent', '4.6.0'
-mod 'saz/resolv_conf', '4.1.0'
+mod 'saz/resolv_conf', '4.2.1'
 mod 'saz/ssh', '6.0.0'
 mod 'puppet/cron', '1.3.1'
 mod 'puppet/r10k', '9.0.0'
@@ -23,7 +23,7 @@ mod 'duritong/sysctl',
   ref: 'working'
 mod 'example42/network',
   git: 'https://github.com/example42/puppet-network',
-  ref: 'b34d44d7818140d724333dfa00688fc46f6dae1a'  # post v3.5.3
+  ref: 'b2e402dff7ec54c4e6696dfd0d0591828bd13bd8'  # post v3.6.0
 mod 'cirrax/libvirt', '4.1.2'
 #mod 'puppetfinland/easy_ipa', '2.2.0'
 mod 'puppetfinland/easy_ipa',

hieradata/node/core1.tu.lsst.org.yaml

@@ -1,4 +1,4 @@
 ---
 network::interfaces_hash:
   em1:  # fqdn
-    ipaddress: "140.252.35.7"
+    ipaddress: "140.252.146.68"

hieradata/node/core2.tu.lsst.org.yaml

@@ -1,4 +1,4 @@
 ---
 network::interfaces_hash:
   em1:  # fqdn
-    ipaddress: "140.252.35.8"
+    ipaddress: "140.252.146.69"

hieradata/node/core3.tu.lsst.org.yaml

@@ -1,4 +1,4 @@
 ---
 network::interfaces_hash:
   em1:  # fqdn
-    ipaddress: "140.252.35.20"
+    ipaddress: "140.252.146.70"

hieradata/node/dns1.tu.lsst.org.yaml

@@ -1,4 +1,4 @@
 ---
 network::interfaces_hash:
   eth0:  # fqdn
-    ipaddress: "140.252.34.140"
+    ipaddress: "140.252.146.71"

hieradata/node/dns2.tu.lsst.org.yaml

@@ -1,4 +1,4 @@
 ---
 network::interfaces_hash:
   eth0:  # fqdn
-    ipaddress: "140.252.34.141"
+    ipaddress: "140.252.146.72"

hieradata/node/dns3.tu.lsst.org.yaml

@@ -1,5 +1,5 @@
 ---
 network::interfaces_hash:
   eth0:  # fqdn
-    ipaddress: "140.252.34.142"
+    ipaddress: "140.252.146.73"
     domain: "tu.lsst.org"

hieradata/node/foreman.tuc.lsst.cloud.yaml

@@ -1,14 +1,15 @@
 ---
 network::interfaces_hash:
-  eth2:  # fqdn
+  eth0:  # fqdn
     bootproto: "none"
     defroute: "yes"
     dns1: "%{lookup('dhcp::nameservers.0')}"
     dns2: "%{lookup('dhcp::nameservers.1')}"
     domain: "tuc.lsst.cloud"
-    ipaddress: "140.252.34.132"
-    gateway: "140.252.34.129"
-    netmask: "255.255.255.192"
+    gateway: "140.252.146.65"
+    ipaddress: "140.252.146.80"
+    macaddr: "52:54:00:d4:45:77"
+    netmask: "255.255.255.224"
     nozeroconf: "yes"
     onboot: "yes"
     type: "Ethernet"

hieradata/node/ipa1.tu.lsst.org.yaml

@@ -1,4 +1,4 @@
 ---
 network::interfaces_hash:
   eth0:  # fqdn
-    ipaddress: "140.252.34.177"
+    ipaddress: "140.252.146.74"

hieradata/node/ipa2.tu.lsst.org.yaml

@@ -1,4 +1,4 @@
 ---
 network::interfaces_hash:
   eth0:  # fqdn
-    ipaddress: "140.252.34.175"
+    ipaddress: "140.252.146.75"

hieradata/node/ipa3.tu.lsst.org.yaml

@@ -1,4 +1,4 @@
 ---
 network::interfaces_hash:
   eth0:  # fqdn
-    ipaddress: "140.252.34.176"
+    ipaddress: "140.252.146.76"

hieradata/org/lsst/role/puppetdb.yaml

@@ -2,20 +2,23 @@
 classes:
   - "profile::core::common"
   - "puppetdb"
-  - "puppetdb::globals"
   - "scl"
 
+packages:
+  - "rh-postgresql12-syspaths"
+postgresql::client::package_name: "rh-postgresql12-syspaths"  # appears to be ignored
+# puppetdb::globals is declared by puppetdb::database::postgresql
+postgresql::globals::bindir: "/usr/bin"
+postgresql::globals::client_package_name: "rh-postgresql12-syspaths"  # appears to be ignored
+postgresql::globals::confdir: "/var/opt/rh/rh-postgresql12/lib/pgsql/data"
+postgresql::globals::contrib_package_name: "rh-postgresql12-postgresql-contrib-syspaths"
+postgresql::globals::datadir: "/var/opt/rh/rh-postgresql12/lib/pgsql/data"
+postgresql::globals::server_package_name: "rh-postgresql12-postgresql-server-syspaths"
+postgresql::globals::service_name: "postgresql"
+postgresql::globals::version: "12"
+puppetdb::database_listen_address: "localhost"
+puppetdb::globals::version: "6.16.1"
 puppetdb::java_args:
   "-Xmx": "1g"
   "-Xms": "512m"
-puppetdb::globals::version: "6.16.1"
 puppetdb::listen_address: "0.0.0.0"
-puppetdb::database_listen_address: "localhost"
-postgresql::globals::version: "12"
-postgresql::globals::client_package_name: "rh-postgresql12-syspaths"
-postgresql::globals::server_package_name: "rh-postgresql12-postgresql-server-syspaths"
-postgresql::globals::contrib_package_name: "rh-postgresql12-postgresql-contrib-syspaths"
-postgresql::globals::service_name: "postgresql"
-postgresql::globals::datadir: "/var/opt/rh/rh-postgresql12/lib/pgsql/data"
-postgresql::globals::confdir: "/var/opt/rh/rh-postgresql12/lib/pgsql/data"
-postgresql::globals::bindir: "/usr/bin"

hieradata/site/tu.yaml

@@ -6,9 +6,9 @@ profile::core::common::disable_ipv6: true
 dhcp::dnsdomain: &dnsdomains
   - "tu.lsst.org"
 dhcp::nameservers: &nameservers
-  - "140.252.34.140"
-  - "140.252.34.141"
-  - "140.252.34.142"
+  - "140.252.146.71"
+  - "140.252.146.72"
+  - "140.252.146.73"
 dhcp::ntpservers: &ntpservers
   - "140.252.1.140"
   - "140.252.1.141"
@@ -18,11 +18,15 @@ chrony::servers: *ntpservers
 ntp::servers: *ntpservers
 resolv_conf::nameservers: *nameservers
 resolv_conf::searchpath: *dnsdomains
+resolv_conf::options:
+  - "rotate"
+  - "timeout:2"
+  - "retries:1"
 
 accounts::user_list:
   root:
     sshkeys:
       # foreman-proxy
-      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDUB0OC/01VRh98rWDLta493+SlN8UNbMKGC8QdHGOy844Ae2eHijlZqmasrJaUA0UH56hmdTVKD7HDjKFN107t1P9TN1SvMV+exL54mUKgETya9V9juRy2/gYhdT55A4i+wGPNcRK1hgS4mCNJHKXhaSl8xufFU95Q0xNnhz0xoBc73EpkrGaUvzmYJAshQokknO66G2u9nEy4yvy0Q1IsSjq5BDt3rtPSD6RKLg+1mWeHNdd8ky3Pe9TXZLo4wav//WnSmfTSE1P8JsNVpcWKvsT5y5rnmnPn5siLYlqvUC4xfUXxR95NX1alPfsIzEHNERzCLcDK9KyqGaKLBVjtyu0LQHu2WadhPY1h9n1ey0haps8QCfNSmNGSVedSTfm5Nf90EtZ7d/eDXuzlBd2nIVn+o0BUa2zBUEI9KzX8t/H+HJabBo9cl2nQ9/EurN1OsgH6bwiTt5sQkHKcJl24bfgyo8sXC5mi2T8cQLQrkY4kuBKV7X3fImdERc4c+fk= comcam-cluster"
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCjbrCz3m21/gVUH34zoLsxzL1gYuVRNngZ5P6/3/Iw8LR0eMRmkqDZGDR27R91xQSQ4iazP35yeeWH18y+GLUXgfskjYpwqHZ+JBhnaYBoAUaogXYw2FGZAlvjtKZlFclSXu16jKq5sF0woDC6KBxRJuu24EuL2QY9pGPReFGNwgYmruhIDeRZpj/vy7+2+L/hqXTcq42xRMUYRLomR8C7LXkZvrH59QuWYh71Nsx8Qko901c/qpgEynu4ZQFOrSVRgEWPls/Y/aWSAT1k68tGaFQ+W0CP7CA2pbR+ZjcxbodXMoOwxUgHbhR3SwNpGeKEtKh4Csd5e6pgIskW2kX7 root@foreman.tuc.lsst.cloud"
 
 profile::core::common::deploy_icinga_agent: false

hieradata/site/tu/role/dnscache.yaml

@@ -16,8 +16,8 @@ network::interfaces_hash:
     dns1: "%{lookup('dhcp::nameservers.0')}"
     dns2: "%{lookup('dhcp::nameservers.1')}"
     domain: "%{lookup('dhcp::dnsdomain.0')}"
-    gateway: "140.252.34.129"
-    netmask: "255.255.255.192"
+    gateway: "140.252.146.65"
+    netmask: "255.255.255.224"
     nozeroconf: "yes"
     onboot: "yes"
     type: "Ethernet"

hieradata/site/tu/role/foreman.yaml

@@ -5,34 +5,10 @@ classes:
 profile::core::sysctl::rp_filter::enable: false
 dhcp::interfaces:
   - "eth0"
-  - "eth1"
-  - "eth2"
-  - "eth3"
 dhcp::authoritative: false
-dhcp::pxeserver: "140.252.34.132"
+dhcp::pxeserver: "140.252.146.80"
 # theforeman/dhcp 5.0.1 only supports `option domain-search` per pool
 dhcp::pools:
-  vlan700:
-    network: "140.252.34.0"
-    mask: "255.255.255.192"
-    gateway: "140.252.34.1"
-    range: "140.252.34.5 140.252.34.39"
-    search_domains: "%{alias('dhcp::dnsdomain')}"
-  vlan800:
-    network: "140.252.34.128"
-    mask: "255.255.255.192"
-    gateway: "140.252.34.129"
-    #Excluding 150 for rancher.tu
-    range:
-      - "140.252.34.133 140.252.34.149"
-      - "140.252.34.151 140.252.34.190"
-    search_domains: "%{alias('dhcp::dnsdomain')}"
-  vlan801:
-    network: "140.252.35.0"
-    mask: "255.255.255.128"
-    gateway: "140.252.35.1"
-    range: "140.252.35.5 140.252.35.126"
-    search_domains: "%{alias('dhcp::dnsdomain')}"
   vlan3030:  # pillian
     network: "140.252.146.32"
     mask: "255.255.255.224"

hieradata/site/tu/role/hypervisor.yaml

@@ -7,16 +7,16 @@ accounts::user_list:
     managehome: true
     system: true
     sshkeys:
-      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGCCYvVfrd3RvPlGtXh+e3NWWw7OVzvIyX9jj1jT2omYt07gPv2nx9xgHqtkr1n39aezN4T2/9PuuCinN/dCOAmDd1J3lV+4rbWVUQD1o356ElxnVgdDm7RLwFfGjNW+WnVVOSXudZaO8wN6JqzG0SM21bmaIrT5b8pmXI9aafIEtnVhUKpVrqXOMQR8RNF9nvnzQulRkX7y/Kcy//a1v6/1lt4D+0Y5QaQujt04i8+QkcUBNe9sukjYWfzcPW9FpdJAiiydxwJl27f8OvJ4OMp1LJkB8lI5BLvJQpJ6u0DlfjkrSusDx60MSU3LQKP9TsaOW16b+/FqcHpkSpLGy/ foreman@foreman.tu.lsst.org"
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCjbrCz3m21/gVUH34zoLsxzL1gYuVRNngZ5P6/3/Iw8LR0eMRmkqDZGDR27R91xQSQ4iazP35yeeWH18y+GLUXgfskjYpwqHZ+JBhnaYBoAUaogXYw2FGZAlvjtKZlFclSXu16jKq5sF0woDC6KBxRJuu24EuL2QY9pGPReFGNwgYmruhIDeRZpj/vy7+2+L/hqXTcq42xRMUYRLomR8C7LXkZvrH59QuWYh71Nsx8Qko901c/qpgEynu4ZQFOrSVRgEWPls/Y/aWSAT1k68tGaFQ+W0CP7CA2pbR+ZjcxbodXMoOwxUgHbhR3SwNpGeKEtKh4Csd5e6pgIskW2kX7 root@foreman.tuc.lsst.cloud"
 network::interfaces_hash:
   em1:  # fqdn
     bootproto: "none"
     defroute: "yes"
     dns1: "%{lookup('dhcp::nameservers.0')}"
     dns2: "%{lookup('dhcp::nameservers.1')}"
     domain: "%{lookup('dhcp::dnsdomain.0')}"
-    gateway: "140.252.35.1"
-    netmask: "255.255.255.128"
+    gateway: "140.252.146.65"
+    netmask: "255.255.255.224"
     nozeroconf: "yes"
     onboot: "yes"
     type: "Ethernet"
@@ -32,29 +32,14 @@ network::interfaces_hash:
     bootproto: "none"
     onboot: "no"
     type: "Ethernet"
-  p2p1.700: &vlan_int
+  p2p1.3040: &vlan_int
     bootproto: "none"
+    bridge: "br3040"
+    nozeroconf: "yes"
     onboot: "yes"
-    vlan: "yes"
-    bridge: "br700"
     type: "none"
-    nozeroconf: "yes"
-  p2p1.800:
-    <<: *vlan_int
-    bridge: "br800"
-  p2p1.801:
-    <<: *vlan_int
-    bridge: "br801"
-  p2p1.3040:
-    <<: *vlan_int
-    bridge: "br3040"
-  br700: &bridge_int  # old auxtel - keep until pontus is moved to rm101
+    vlan: "yes"
+  br3040: &bridge_int  # coresvc
     bootproto: "none"
     onboot: "yes"
     type: "bridge"
-  br800:  # old svc
-    <<: *bridge_int
-  br801:  # old mgt
-    <<: *bridge_int
-  br3040:  # coresvc
-    <<: *bridge_int

hieradata/site/tu/role/ipareplica.yaml

@@ -9,8 +9,8 @@ network::interfaces_hash:
     dns1: "%{lookup('dhcp::nameservers.0')}"
     dns2: "%{lookup('dhcp::nameservers.1')}"
     domain: "%{lookup('dhcp::dnsdomain.0')}"
-    gateway: "140.252.34.129"
-    netmask: "255.255.255.192"
+    gateway: "140.252.146.65"
+    netmask: "255.255.255.224"
     nozeroconf: "yes"
     onboot: "yes"
     type: "Ethernet"