Merge branch 'master' of /git/ansible

This commit is contained in:
Rick Elrod 2017-05-10 20:19:40 +00:00
commit 522f02041d

View file

@ -22,7 +22,7 @@ acl "everyone" { 0.0.0.0/0; ::0/0; };
//
acl "ns_redhat" { 66.187.233.210; 209.132.183.2; 66.187.229.10; };
//
acl "phx2net" { 10.4.124.128/25; 10.5.78.0/24; 10.5.79.0/24; 10.5.125.0/24; 10.5.126.0/24; 10.5.127.0/24; 10.5.129.0/24; 10.16.0.0/24; };
acl "phx2net" { 10.4.124.128/25; 10.5.78.0/24; 10.5.79.0/24; 10.5.125.0/24; 10.5.126.0/24; 10.5.127.0/24; 10.5.128.0/24; 10.5.129.0/24; 10.5.130.0/24; 10.16.0.0/24; };
acl "qanet" { 10.5.124.128/25; 10.5.131.0/24; };
acl "rh-slaves" { 10.5.30.78; 10.11.5.70; };
acl "rh" { 10.0.0.0/8; };