diff --git a/roles/batcave/tasks/main.yml b/roles/batcave/tasks/main.yml index e79c0e692e..5a58f5a277 100644 --- a/roles/batcave/tasks/main.yml +++ b/roles/batcave/tasks/main.yml @@ -63,6 +63,7 @@ with_items: - srm # secure rm to delete sensitive files. - ansible # This is our ansible master, needs ansible installed. + - ansible_utils # Needed for rbac-playbook - yum-rhn-plugin # Needed for rhn sync - createrepo_c # Needed for rhn sync - ostree # Needed for rhn sync diff --git a/roles/openvpn/server/files/ccd/backup01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/backup01.iad2.fedoraproject.org index ae1e4878df..efbac1b80f 100644 --- a/roles/openvpn/server/files/ccd/backup01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/backup01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.64 192.168.0.64 +ifconfig-push 192.168.20.64 192.168.0.64 diff --git a/roles/openvpn/server/files/ccd/batcave01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/batcave01.iad2.fedoraproject.org index cbc8399bf7..d0501bdf2e 100644 --- a/roles/openvpn/server/files/ccd/batcave01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/batcave01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.41 192.168.0.41 +ifconfig-push 192.168.20.41 192.168.0.41 diff --git a/roles/openvpn/server/files/ccd/blockerbugs01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/blockerbugs01.iad2.fedoraproject.org index 7ecdb13a09..a613da6f51 100644 --- a/roles/openvpn/server/files/ccd/blockerbugs01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/blockerbugs01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.99 192.168.0.99 +ifconfig-push 192.168.20.99 192.168.0.99 diff --git a/roles/openvpn/server/files/ccd/busgateway01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/busgateway01.iad2.fedoraproject.org index a2dd494820..b83524e63a 100644 --- a/roles/openvpn/server/files/ccd/busgateway01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/busgateway01.iad2.fedoraproject.org @@ -1 +1 @@ -ifconfig-push 192.168.1.50 192.168.0.50 +ifconfig-push 192.168.20.50 192.168.0.50 diff --git a/roles/openvpn/server/files/ccd/datagrepper01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/datagrepper01.iad2.fedoraproject.org index 7d8e263277..b0a1674e3f 100644 --- a/roles/openvpn/server/files/ccd/datagrepper01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/datagrepper01.iad2.fedoraproject.org @@ -1 +1 @@ -ifconfig-push 192.168.1.104 192.168.0.104 +ifconfig-push 192.168.20.104 192.168.0.104 diff --git a/roles/openvpn/server/files/ccd/github2fedmsg01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/github2fedmsg01.iad2.fedoraproject.org index a78d135720..a03508328d 100644 --- a/roles/openvpn/server/files/ccd/github2fedmsg01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/github2fedmsg01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.133 192.168.0.133 +ifconfig-push 192.168.20.133 192.168.0.133 diff --git a/roles/openvpn/server/files/ccd/ipa01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/ipa01.iad2.fedoraproject.org index dd1758f2bc..539e5f08e7 100644 --- a/roles/openvpn/server/files/ccd/ipa01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/ipa01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.156 192.168.0.156 +ifconfig-push 192.168.20.156 192.168.0.156 diff --git a/roles/openvpn/server/files/ccd/ipa02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/ipa02.iad2.fedoraproject.org index 60dbe68248..707fdb9300 100644 --- a/roles/openvpn/server/files/ccd/ipa02.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/ipa02.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.157 192.168.0.157 +ifconfig-push 192.168.20.157 192.168.0.157 diff --git a/roles/openvpn/server/files/ccd/kerneltest01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/kerneltest01.iad2.fedoraproject.org index 62b1c59019..5aaf31cdfd 100644 --- a/roles/openvpn/server/files/ccd/kerneltest01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/kerneltest01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.134 192.168.0.134 +ifconfig-push 192.168.20.134 192.168.0.134 diff --git a/roles/openvpn/server/files/ccd/log01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/log01.iad2.fedoraproject.org index 36059a914f..b373f28262 100644 --- a/roles/openvpn/server/files/ccd/log01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/log01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.59 192.168.0.59 +ifconfig-push 192.168.20.59 192.168.0.59 diff --git a/roles/openvpn/server/files/ccd/mailman01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/mailman01.iad2.fedoraproject.org index 42cda1090d..71db42e8fa 100644 --- a/roles/openvpn/server/files/ccd/mailman01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/mailman01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.118 192.168.0.118 +ifconfig-push 192.168.20.118 192.168.0.118 diff --git a/roles/openvpn/server/files/ccd/mbs-frontend01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/mbs-frontend01.iad2.fedoraproject.org index ef9ffc9426..5a113a955c 100644 --- a/roles/openvpn/server/files/ccd/mbs-frontend01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/mbs-frontend01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.163 192.168.0.163 +ifconfig-push 192.168.20.163 192.168.0.163 diff --git a/roles/openvpn/server/files/ccd/mm-frontend-checkin01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/mm-frontend-checkin01.iad2.fedoraproject.org index 84e33f9dee..2fdf4e5282 100644 --- a/roles/openvpn/server/files/ccd/mm-frontend-checkin01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/mm-frontend-checkin01.iad2.fedoraproject.org @@ -1 +1 @@ -ifconfig-push 192.168.100.11 192.168.100.11 +ifconfig-push 192.168.100.12 192.168.100.11 diff --git a/roles/openvpn/server/files/ccd/mm-frontend01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/mm-frontend01.iad2.fedoraproject.org index 92aa16542d..e153edfa7d 100644 --- a/roles/openvpn/server/files/ccd/mm-frontend01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/mm-frontend01.iad2.fedoraproject.org @@ -1 +1 @@ -ifconfig-push 192.168.1.141 192.168.1.141 +ifconfig-push 192.168.20.141 192.168.1.141 diff --git a/roles/openvpn/server/files/ccd/noc01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/noc01.iad2.fedoraproject.org index b300ba6b27..2a647faaed 100644 --- a/roles/openvpn/server/files/ccd/noc01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/noc01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.10 192.168.0.10 +ifconfig-push 192.168.20.10 192.168.0.10 diff --git a/roles/openvpn/server/files/ccd/notifs-web01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/notifs-web01.iad2.fedoraproject.org index 3aae1d284d..55e6ccb21c 100644 --- a/roles/openvpn/server/files/ccd/notifs-web01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/notifs-web01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.80 192.168.0.80 +ifconfig-push 192.168.20.80 192.168.0.80 diff --git a/roles/openvpn/server/files/ccd/oci-candidate-registry01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/oci-candidate-registry01.iad2.fedoraproject.org index 6a8829c7bb..7acb148c4c 100644 --- a/roles/openvpn/server/files/ccd/oci-candidate-registry01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/oci-candidate-registry01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.93 192.168.0.93 +ifconfig-push 192.168.20.93 192.168.0.93 diff --git a/roles/openvpn/server/files/ccd/oci-registry01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/oci-registry01.iad2.fedoraproject.org index cf4a1082c2..65954e7169 100644 --- a/roles/openvpn/server/files/ccd/oci-registry01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/oci-registry01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.168 192.168.0.168 +ifconfig-push 192.168.20.168 192.168.0.168 diff --git a/roles/openvpn/server/files/ccd/odcs-frontend01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/odcs-frontend01.iad2.fedoraproject.org index 7cef1f5500..cde29e3d29 100644 --- a/roles/openvpn/server/files/ccd/odcs-frontend01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/odcs-frontend01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.175 192.168.0.175 +ifconfig-push 192.168.20.175 192.168.0.175 diff --git a/roles/openvpn/server/files/ccd/openqa01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/openqa01.iad2.fedoraproject.org index cdae5634a8..78f0cf0645 100644 --- a/roles/openvpn/server/files/ccd/openqa01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/openqa01.iad2.fedoraproject.org @@ -1,3 +1,3 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.154 192.168.0.154 +ifconfig-push 192.168.20.154 192.168.0.154 diff --git a/roles/openvpn/server/files/ccd/os-master01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-master01.iad2.fedoraproject.org index 8fea5162cd..cc281a2431 100644 --- a/roles/openvpn/server/files/ccd/os-master01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/os-master01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.170 192.168.0.170 +ifconfig-push 192.168.20.170 192.168.0.170 diff --git a/roles/openvpn/server/files/ccd/os-master02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-master02.iad2.fedoraproject.org index e32832d3d7..1145c8dfc4 100644 --- a/roles/openvpn/server/files/ccd/os-master02.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/os-master02.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.171 192.168.0.171 +ifconfig-push 192.168.20.171 192.168.0.171 diff --git a/roles/openvpn/server/files/ccd/os-master03.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-master03.iad2.fedoraproject.org index cffb6aa038..46fdc7dfd6 100644 --- a/roles/openvpn/server/files/ccd/os-master03.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/os-master03.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.172 192.168.0.172 +ifconfig-push 192.168.20.172 192.168.0.172 diff --git a/roles/openvpn/server/files/ccd/os-node01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node01.iad2.fedoraproject.org index 431d97ec5d..e4b2c8fbe0 100644 --- a/roles/openvpn/server/files/ccd/os-node01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/os-node01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.173 192.168.0.173 +ifconfig-push 192.168.20.173 192.168.0.173 diff --git a/roles/openvpn/server/files/ccd/os-node02.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node02.iad2.fedoraproject.org index 0831a99310..08251ac51e 100644 --- a/roles/openvpn/server/files/ccd/os-node02.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/os-node02.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.174 192.168.0.174 +ifconfig-push 192.168.20.174 192.168.0.174 diff --git a/roles/openvpn/server/files/ccd/os-node03.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node03.iad2.fedoraproject.org index 86a784401e..289e6f7fc6 100644 --- a/roles/openvpn/server/files/ccd/os-node03.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/os-node03.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.181 192.168.0.181 +ifconfig-push 192.168.20.181 192.168.0.181 diff --git a/roles/openvpn/server/files/ccd/os-node04.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node04.iad2.fedoraproject.org index dbbf6f7034..65661c0f34 100644 --- a/roles/openvpn/server/files/ccd/os-node04.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/os-node04.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.182 192.168.0.182 +ifconfig-push 192.168.20.182 192.168.0.182 diff --git a/roles/openvpn/server/files/ccd/os-node05.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node05.iad2.fedoraproject.org index 7c3e4518ae..ae242ecf23 100644 --- a/roles/openvpn/server/files/ccd/os-node05.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/os-node05.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.183 192.168.0.183 +ifconfig-push 192.168.20.183 192.168.0.183 diff --git a/roles/openvpn/server/files/ccd/osbs-master01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/osbs-master01.iad2.fedoraproject.org new file mode 100644 index 0000000000..d7549045a7 --- /dev/null +++ b/roles/openvpn/server/files/ccd/osbs-master01.iad2.fedoraproject.org @@ -0,0 +1,2 @@ +# ifconfig-push actualIP PtPIP +ifconfig-push 192.168.20.114 192.168.0.114 diff --git a/roles/openvpn/server/files/ccd/pdc-web01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/pdc-web01.iad2.fedoraproject.org index 27a65542ef..b9f4f898da 100644 --- a/roles/openvpn/server/files/ccd/pdc-web01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/pdc-web01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.5 192.168.0.5 +ifconfig-push 192.168.20.5 192.168.0.5 diff --git a/roles/openvpn/server/files/ccd/proxy01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy01.iad2.fedoraproject.org index 401ee218ea..ec6b69c357 100644 --- a/roles/openvpn/server/files/ccd/proxy01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/proxy01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.11 192.168.0.11 +ifconfig-push 192.168.20.11 192.168.0.11 diff --git a/roles/openvpn/server/files/ccd/proxy10.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy10.iad2.fedoraproject.org index 55c0293dc8..b9d7d1c291 100644 --- a/roles/openvpn/server/files/ccd/proxy10.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/proxy10.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.17 192.168.0.17 +ifconfig-push 192.168.20.17 192.168.0.17 diff --git a/roles/openvpn/server/files/ccd/resultsdb01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/resultsdb01.iad2.fedoraproject.org index f1420d9f31..45dfee3579 100644 --- a/roles/openvpn/server/files/ccd/resultsdb01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/resultsdb01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.137 192.168.0.137 +ifconfig-push 192.168.20.137 192.168.0.137 diff --git a/roles/openvpn/server/files/ccd/sundries01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/sundries01.iad2.fedoraproject.org index 853b768a97..1febfe09f8 100644 --- a/roles/openvpn/server/files/ccd/sundries01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/sundries01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.127 192.168.0.127 +ifconfig-push 192.168.20.127 192.168.0.127 diff --git a/roles/openvpn/server/files/ccd/value01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/value01.iad2.fedoraproject.org index 4f7ffc01fd..9193003ec8 100644 --- a/roles/openvpn/server/files/ccd/value01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/value01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.28 192.168.0.28 +ifconfig-push 192.168.20.28 192.168.0.28 diff --git a/roles/openvpn/server/files/ccd/wiki01.iad2.fedoraproject.org b/roles/openvpn/server/files/ccd/wiki01.iad2.fedoraproject.org index bc933a9050..0f54e6236d 100644 --- a/roles/openvpn/server/files/ccd/wiki01.iad2.fedoraproject.org +++ b/roles/openvpn/server/files/ccd/wiki01.iad2.fedoraproject.org @@ -1,2 +1,2 @@ # ifconfig-push actualIP PtPIP -ifconfig-push 192.168.1.129 192.168.0.129 +ifconfig-push 192.168.20.129 192.168.0.129