Chad has uploaded a new change for review. https://gerrit.wikimedia.org/r/247324
Change subject: Generate mediawiki-installation dsh group file from hiera data ...................................................................... Generate mediawiki-installation dsh group file from hiera data This allows it to be configurable in any labs environment, not just production and beta. In common with how we do the rest of these dsh group files, and moves all the scap target list stuff to one location instead of yaml and a random flat file Change-Id: I89a8191cb4ef7f0a10597e987f5c5f0b6dbf6aa3 --- M hieradata/common/scap/dsh.yaml M hieradata/labs/deployment-prep/common.yaml D modules/beta/files/dsh/group/mediawiki-installation D modules/scap/files/dsh/group/mediawiki-installation M modules/scap/manifests/dsh.pp 5 files changed, 503 insertions(+), 499 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/24/247324/1 diff --git a/hieradata/common/scap/dsh.yaml b/hieradata/common/scap/dsh.yaml index a3bbfd7..d3171aa 100644 --- a/hieradata/common/scap/dsh.yaml +++ b/hieradata/common/scap/dsh.yaml @@ -18,3 +18,489 @@ scap_masters: - "tin.eqiad.wmnet" - "mira.codfw.wmnet" + +# !all names added here must be FQDN's now (T93983) ! +mediawiki_installation: + - mira.codfw.wmnet + - silver.wikimedia.org + - tin.eqiad.wmnet + - terbium.eqiad.wmnet + - snapshot1001.eqiad.wmnet + - snapshot1002.eqiad.wmnet + - snapshot1003.eqiad.wmnet + - snapshot1004.eqiad.wmnet + # eqiad + - mw1001.eqiad.wmnet + - mw1002.eqiad.wmnet + - mw1003.eqiad.wmnet + - mw1004.eqiad.wmnet + - mw1005.eqiad.wmnet + - mw1006.eqiad.wmnet + - mw1007.eqiad.wmnet + - mw1008.eqiad.wmnet + - mw1009.eqiad.wmnet + - mw1010.eqiad.wmnet + - mw1011.eqiad.wmnet + - mw1012.eqiad.wmnet + - mw1013.eqiad.wmnet + - mw1014.eqiad.wmnet + - mw1015.eqiad.wmnet + - mw1016.eqiad.wmnet + - mw1017.eqiad.wmnet + - mw1018.eqiad.wmnet + - mw1019.eqiad.wmnet + - mw1020.eqiad.wmnet + - mw1021.eqiad.wmnet + - mw1022.eqiad.wmnet + - mw1023.eqiad.wmnet + - mw1024.eqiad.wmnet + - mw1025.eqiad.wmnet + - mw1026.eqiad.wmnet + - mw1027.eqiad.wmnet + - mw1028.eqiad.wmnet + - mw1029.eqiad.wmnet + - mw1030.eqiad.wmnet + - mw1032.eqiad.wmnet + - mw1033.eqiad.wmnet + - mw1034.eqiad.wmnet + - mw1035.eqiad.wmnet + - mw1036.eqiad.wmnet + - mw1037.eqiad.wmnet + - mw1038.eqiad.wmnet + - mw1039.eqiad.wmnet + - mw1040.eqiad.wmnet + - mw1041.eqiad.wmnet + - mw1042.eqiad.wmnet + - mw1043.eqiad.wmnet + - mw1044.eqiad.wmnet + - mw1045.eqiad.wmnet + - mw1046.eqiad.wmnet + - mw1047.eqiad.wmnet + - mw1048.eqiad.wmnet + - mw1049.eqiad.wmnet + - mw1050.eqiad.wmnet + - mw1051.eqiad.wmnet + - mw1052.eqiad.wmnet + - mw1053.eqiad.wmnet + - mw1054.eqiad.wmnet + - mw1055.eqiad.wmnet + - mw1056.eqiad.wmnet + - mw1057.eqiad.wmnet + - mw1058.eqiad.wmnet + - mw1059.eqiad.wmnet + - mw1060.eqiad.wmnet + - mw1061.eqiad.wmnet + - mw1062.eqiad.wmnet + - mw1063.eqiad.wmnet + - mw1064.eqiad.wmnet + - mw1065.eqiad.wmnet + - mw1066.eqiad.wmnet + - mw1067.eqiad.wmnet + - mw1068.eqiad.wmnet + - mw1069.eqiad.wmnet + - mw1070.eqiad.wmnet + - mw1071.eqiad.wmnet + - mw1072.eqiad.wmnet + - mw1073.eqiad.wmnet + - mw1074.eqiad.wmnet + - mw1075.eqiad.wmnet + - mw1076.eqiad.wmnet + - mw1077.eqiad.wmnet + - mw1078.eqiad.wmnet + - mw1079.eqiad.wmnet + - mw1080.eqiad.wmnet + - mw1081.eqiad.wmnet + - mw1082.eqiad.wmnet + - mw1083.eqiad.wmnet + - mw1084.eqiad.wmnet + - mw1085.eqiad.wmnet + - mw1086.eqiad.wmnet + - mw1087.eqiad.wmnet + - mw1088.eqiad.wmnet + - mw1089.eqiad.wmnet + - mw1090.eqiad.wmnet + - mw1091.eqiad.wmnet + - mw1092.eqiad.wmnet + - mw1093.eqiad.wmnet + - mw1094.eqiad.wmnet + - mw1095.eqiad.wmnet + - mw1096.eqiad.wmnet + - mw1097.eqiad.wmnet + - mw1098.eqiad.wmnet + - mw1099.eqiad.wmnet + - mw1100.eqiad.wmnet + - mw1101.eqiad.wmnet + - mw1102.eqiad.wmnet + - mw1103.eqiad.wmnet + - mw1104.eqiad.wmnet + - mw1105.eqiad.wmnet + - mw1106.eqiad.wmnet + - mw1107.eqiad.wmnet + - mw1108.eqiad.wmnet + - mw1109.eqiad.wmnet + - mw1110.eqiad.wmnet + - mw1111.eqiad.wmnet + - mw1112.eqiad.wmnet + - mw1113.eqiad.wmnet + - mw1114.eqiad.wmnet + - mw1115.eqiad.wmnet + - mw1116.eqiad.wmnet + - mw1117.eqiad.wmnet + - mw1118.eqiad.wmnet + - mw1119.eqiad.wmnet + - mw1120.eqiad.wmnet + - mw1121.eqiad.wmnet + - mw1122.eqiad.wmnet + - mw1123.eqiad.wmnet + - mw1124.eqiad.wmnet + - mw1125.eqiad.wmnet + - mw1126.eqiad.wmnet + - mw1127.eqiad.wmnet + - mw1128.eqiad.wmnet + - mw1129.eqiad.wmnet + - mw1130.eqiad.wmnet + - mw1131.eqiad.wmnet + - mw1132.eqiad.wmnet + - mw1133.eqiad.wmnet + - mw1134.eqiad.wmnet + - mw1135.eqiad.wmnet + - mw1136.eqiad.wmnet + - mw1137.eqiad.wmnet + - mw1138.eqiad.wmnet + - mw1139.eqiad.wmnet + - mw1140.eqiad.wmnet + - mw1141.eqiad.wmnet + - mw1142.eqiad.wmnet + - mw1143.eqiad.wmnet + - mw1144.eqiad.wmnet + - mw1145.eqiad.wmnet + - mw1146.eqiad.wmnet + - mw1147.eqiad.wmnet + - mw1148.eqiad.wmnet + - mw1149.eqiad.wmnet + - mw1150.eqiad.wmnet + - mw1151.eqiad.wmnet + - mw1152.eqiad.wmnet + - mw1153.eqiad.wmnet + - mw1154.eqiad.wmnet + - mw1155.eqiad.wmnet + - mw1156.eqiad.wmnet + - mw1157.eqiad.wmnet + - mw1158.eqiad.wmnet + - mw1159.eqiad.wmnet + - mw1160.eqiad.wmnet + - mw1161.eqiad.wmnet + - mw1162.eqiad.wmnet + - mw1163.eqiad.wmnet + - mw1164.eqiad.wmnet + - mw1165.eqiad.wmnet + - mw1166.eqiad.wmnet + - mw1167.eqiad.wmnet + - mw1168.eqiad.wmnet + - mw1169.eqiad.wmnet + - mw1170.eqiad.wmnet + - mw1171.eqiad.wmnet + - mw1172.eqiad.wmnet + - mw1173.eqiad.wmnet + - mw1174.eqiad.wmnet + - mw1175.eqiad.wmnet + - mw1176.eqiad.wmnet + - mw1177.eqiad.wmnet + - mw1178.eqiad.wmnet + - mw1179.eqiad.wmnet + - mw1180.eqiad.wmnet + - mw1181.eqiad.wmnet + - mw1182.eqiad.wmnet + - mw1183.eqiad.wmnet + - mw1184.eqiad.wmnet + - mw1185.eqiad.wmnet + - mw1186.eqiad.wmnet + - mw1187.eqiad.wmnet + - mw1188.eqiad.wmnet + - mw1189.eqiad.wmnet + - mw1190.eqiad.wmnet + - mw1191.eqiad.wmnet + - mw1192.eqiad.wmnet + - mw1193.eqiad.wmnet + - mw1194.eqiad.wmnet + - mw1195.eqiad.wmnet + - mw1196.eqiad.wmnet + - mw1197.eqiad.wmnet + - mw1198.eqiad.wmnet + - mw1199.eqiad.wmnet + - mw1200.eqiad.wmnet + - mw1201.eqiad.wmnet + - mw1202.eqiad.wmnet + - mw1203.eqiad.wmnet + - mw1204.eqiad.wmnet + - mw1205.eqiad.wmnet + - mw1206.eqiad.wmnet + - mw1207.eqiad.wmnet + - mw1208.eqiad.wmnet + - mw1209.eqiad.wmnet + - mw1210.eqiad.wmnet + - mw1211.eqiad.wmnet + - mw1212.eqiad.wmnet + - mw1213.eqiad.wmnet + - mw1214.eqiad.wmnet + - mw1215.eqiad.wmnet + - mw1216.eqiad.wmnet + - mw1217.eqiad.wmnet + - mw1218.eqiad.wmnet + - mw1219.eqiad.wmnet + - mw1220.eqiad.wmnet + - mw1221.eqiad.wmnet + - mw1222.eqiad.wmnet + - mw1223.eqiad.wmnet + - mw1224.eqiad.wmnet + - mw1225.eqiad.wmnet + - mw1226.eqiad.wmnet + - mw1227.eqiad.wmnet + - mw1228.eqiad.wmnet + - mw1229.eqiad.wmnet + - mw1230.eqiad.wmnet + - mw1231.eqiad.wmnet + - mw1232.eqiad.wmnet + - mw1233.eqiad.wmnet + - mw1234.eqiad.wmnet + - mw1235.eqiad.wmnet + - mw1236.eqiad.wmnet + - mw1237.eqiad.wmnet + - mw1238.eqiad.wmnet + - mw1239.eqiad.wmnet + - mw1240.eqiad.wmnet + - mw1241.eqiad.wmnet + - mw1242.eqiad.wmnet + - mw1243.eqiad.wmnet + - mw1244.eqiad.wmnet + - mw1245.eqiad.wmnet + - mw1246.eqiad.wmnet + - mw1247.eqiad.wmnet + - mw1248.eqiad.wmnet + - mw1249.eqiad.wmnet + - mw1250.eqiad.wmnet + - mw1251.eqiad.wmnet + - mw1252.eqiad.wmnet + - mw1253.eqiad.wmnet + - mw1254.eqiad.wmnet + - mw1255.eqiad.wmnet + - mw1256.eqiad.wmnet + - mw1257.eqiad.wmnet + - mw1258.eqiad.wmnet + - mw1259.eqiad.wmnet + - mw1260.eqiad.wmnet + # codfw + - mw2001.codfw.wmnet + - mw2002.codfw.wmnet + - mw2003.codfw.wmnet + - mw2004.codfw.wmnet + - mw2005.codfw.wmnet + - mw2006.codfw.wmnet + - mw2007.codfw.wmnet + - mw2008.codfw.wmnet + - mw2009.codfw.wmnet + - mw2010.codfw.wmnet + - mw2011.codfw.wmnet + - mw2012.codfw.wmnet + - mw2013.codfw.wmnet + - mw2014.codfw.wmnet + - mw2015.codfw.wmnet + - mw2016.codfw.wmnet + - mw2017.codfw.wmnet + - mw2018.codfw.wmnet + - mw2019.codfw.wmnet + - mw2020.codfw.wmnet + - mw2021.codfw.wmnet + - mw2022.codfw.wmnet + - mw2023.codfw.wmnet + - mw2024.codfw.wmnet + - mw2025.codfw.wmnet + - mw2026.codfw.wmnet + - mw2027.codfw.wmnet + - mw2028.codfw.wmnet + - mw2029.codfw.wmnet + - mw2030.codfw.wmnet + - mw2031.codfw.wmnet + - mw2032.codfw.wmnet + - mw2033.codfw.wmnet + - mw2034.codfw.wmnet + - mw2035.codfw.wmnet + - mw2036.codfw.wmnet + - mw2037.codfw.wmnet + - mw2038.codfw.wmnet + - mw2039.codfw.wmnet + - mw2040.codfw.wmnet + - mw2041.codfw.wmnet + - mw2042.codfw.wmnet + - mw2043.codfw.wmnet + - mw2044.codfw.wmnet + - mw2045.codfw.wmnet + - mw2046.codfw.wmnet + - mw2047.codfw.wmnet + - mw2048.codfw.wmnet + - mw2049.codfw.wmnet +# - mw2050.codfw.wmnet + - mw2051.codfw.wmnet + - mw2052.codfw.wmnet + - mw2053.codfw.wmnet + - mw2054.codfw.wmnet + - mw2055.codfw.wmnet + - mw2056.codfw.wmnet + - mw2057.codfw.wmnet + - mw2058.codfw.wmnet + - mw2059.codfw.wmnet + - mw2060.codfw.wmnet + - mw2061.codfw.wmnet + - mw2062.codfw.wmnet + - mw2063.codfw.wmnet + - mw2064.codfw.wmnet + - mw2065.codfw.wmnet + - mw2066.codfw.wmnet + - mw2067.codfw.wmnet + - mw2068.codfw.wmnet + - mw2069.codfw.wmnet + - mw2070.codfw.wmnet + - mw2071.codfw.wmnet + - mw2072.codfw.wmnet + - mw2073.codfw.wmnet + - mw2074.codfw.wmnet + - mw2075.codfw.wmnet + - mw2076.codfw.wmnet + - mw2077.codfw.wmnet + - mw2078.codfw.wmnet + - mw2079.codfw.wmnet + - mw2080.codfw.wmnet + - mw2081.codfw.wmnet + - mw2082.codfw.wmnet + - mw2083.codfw.wmnet + - mw2084.codfw.wmnet + - mw2085.codfw.wmnet + - mw2086.codfw.wmnet + - mw2087.codfw.wmnet + - mw2088.codfw.wmnet + - mw2089.codfw.wmnet + - mw2090.codfw.wmnet + - mw2091.codfw.wmnet + - mw2092.codfw.wmnet + - mw2093.codfw.wmnet + - mw2094.codfw.wmnet + - mw2095.codfw.wmnet + - mw2096.codfw.wmnet + - mw2097.codfw.wmnet + - mw2098.codfw.wmnet + - mw2099.codfw.wmnet + - mw2100.codfw.wmnet + - mw2101.codfw.wmnet + - mw2102.codfw.wmnet + - mw2103.codfw.wmnet + - mw2104.codfw.wmnet + - mw2105.codfw.wmnet + - mw2106.codfw.wmnet + - mw2107.codfw.wmnet + - mw2108.codfw.wmnet + - mw2109.codfw.wmnet + - mw2110.codfw.wmnet + - mw2111.codfw.wmnet + - mw2112.codfw.wmnet + - mw2113.codfw.wmnet + - mw2114.codfw.wmnet + - mw2115.codfw.wmnet + - mw2116.codfw.wmnet + - mw2117.codfw.wmnet + - mw2118.codfw.wmnet + - mw2119.codfw.wmnet + - mw2120.codfw.wmnet + - mw2121.codfw.wmnet + - mw2122.codfw.wmnet + - mw2123.codfw.wmnet + - mw2124.codfw.wmnet + - mw2125.codfw.wmnet + - mw2126.codfw.wmnet + - mw2127.codfw.wmnet +# - mw2128.codfw.wmnet + - mw2129.codfw.wmnet + - mw2130.codfw.wmnet + - mw2131.codfw.wmnet + - mw2132.codfw.wmnet + - mw2133.codfw.wmnet + - mw2134.codfw.wmnet + - mw2135.codfw.wmnet + - mw2136.codfw.wmnet + - mw2137.codfw.wmnet + - mw2138.codfw.wmnet + - mw2139.codfw.wmnet + - mw2140.codfw.wmnet + - mw2141.codfw.wmnet + - mw2142.codfw.wmnet + - mw2143.codfw.wmnet + - mw2144.codfw.wmnet + - mw2145.codfw.wmnet + - mw2146.codfw.wmnet + - mw2147.codfw.wmnet + - mw2148.codfw.wmnet + - mw2149.codfw.wmnet + - mw2150.codfw.wmnet + - mw2151.codfw.wmnet + - mw2152.codfw.wmnet + - mw2153.codfw.wmnet + - mw2154.codfw.wmnet + - mw2155.codfw.wmnet + - mw2156.codfw.wmnet + - mw2157.codfw.wmnet + - mw2158.codfw.wmnet + - mw2159.codfw.wmnet + - mw2160.codfw.wmnet + - mw2161.codfw.wmnet + - mw2162.codfw.wmnet + - mw2163.codfw.wmnet + - mw2164.codfw.wmnet + - mw2165.codfw.wmnet + - mw2166.codfw.wmnet + - mw2167.codfw.wmnet + - mw2168.codfw.wmnet + - mw2169.codfw.wmnet + - mw2170.codfw.wmnet + - mw2171.codfw.wmnet + - mw2172.codfw.wmnet + - mw2173.codfw.wmnet + - mw2174.codfw.wmnet + - mw2175.codfw.wmnet + - mw2176.codfw.wmnet + - mw2177.codfw.wmnet + - mw2178.codfw.wmnet + - mw2179.codfw.wmnet + - mw2180.codfw.wmnet + - mw2181.codfw.wmnet + - mw2182.codfw.wmnet + - mw2183.codfw.wmnet + - mw2184.codfw.wmnet + - mw2185.codfw.wmnet + - mw2186.codfw.wmnet +# - mw2187.codfw.wmnet + - mw2188.codfw.wmnet + - mw2189.codfw.wmnet + - mw2190.codfw.wmnet + - mw2191.codfw.wmnet + - mw2192.codfw.wmnet + - mw2193.codfw.wmnet + - mw2194.codfw.wmnet + - mw2195.codfw.wmnet + - mw2196.codfw.wmnet + - mw2197.codfw.wmnet + - mw2198.codfw.wmnet + - mw2199.codfw.wmnet + - mw2200.codfw.wmnet + - mw2201.codfw.wmnet + - mw2202.codfw.wmnet + - mw2203.codfw.wmnet + - mw2204.codfw.wmnet + - mw2205.codfw.wmnet + - mw2206.codfw.wmnet + - mw2207.codfw.wmnet +# - mw2208.codfw.wmnet +# - mw2209.codfw.wmnet + - mw2210.codfw.wmnet + - mw2211.codfw.wmnet + - mw2212.codfw.wmnet + - mw2213.codfw.wmnet + - mw2214.codfw.wmnet diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 5595ae4..45d4fe4 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -117,7 +117,12 @@ "role::url_downloader::url_downloader_ip": 10.68.16.135 "zotero::http_proxy": deployment-urldownloader.deployment-prep.eqiad.wmflabs:8080 "role::trebuchet::deployment_server": deployment-bastion.eqiad.wmflabs -"scap::dsh::group_source": 'puppet:///modules/beta/dsh/group' +"scap::dsh::mediawiki_installation": + - deployment-jobrunner01.deployment-prep.eqiad.wmflabs + - deployment-mediawiki01.deployment-prep.eqiad.wmflabs + - deployment-mediawiki02.deployment-prep.eqiad.wmflabs + - deployment-mediawiki03.deployment-prep.eqiad.wmflabs + - deployment-tmh01.deployment-prep.eqiad.wmflabs "mediawiki::users::mwdeploy_pub_key": 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFwlmBBBJAr1GI+vuYjFh5vq0YIVa5fqE5DZdpzUZISlQ0Kt+9bIr2qNHIj+Jl5Bc6ZY1mkh8l693tAHVx+8tayoiFWYNs9IVsxR+iHgOOhAdDIBXaHaUattdiye5bQmdvJVXaVegckNX2gbmUCOc09jvZvlk3blKFTSEpZRU8dmpXQzKdZgaAq2VTajAegoFnuN9FbC7hzBPA+1NxFNKn94eIeFPSlo5rWr44OEb5Uy3O0B5c6WPM+IgfiygetP+yGL4cKv7qEjZ0Sxok/Rh1lBh1vP1YQ/Mc6tMV0s+kOv7Wz+P88bfU1/uWvy479OZdfh3NQqDTrLzqHwVW1vef root@deployment-salt' # NOTE: these elasticsearch settings will need to be overloaded on a per-host # basis for the Logstash Elasticsearch cluster. diff --git a/modules/beta/files/dsh/group/mediawiki-installation b/modules/beta/files/dsh/group/mediawiki-installation deleted file mode 100644 index 17dc6e6..0000000 --- a/modules/beta/files/dsh/group/mediawiki-installation +++ /dev/null @@ -1,5 +0,0 @@ -deployment-jobrunner01.deployment-prep.eqiad.wmflabs -deployment-mediawiki01.deployment-prep.eqiad.wmflabs -deployment-mediawiki02.deployment-prep.eqiad.wmflabs -deployment-mediawiki03.deployment-prep.eqiad.wmflabs -deployment-tmh01.deployment-prep.eqiad.wmflabs diff --git a/modules/scap/files/dsh/group/mediawiki-installation b/modules/scap/files/dsh/group/mediawiki-installation deleted file mode 100644 index e5d1c9b..0000000 --- a/modules/scap/files/dsh/group/mediawiki-installation +++ /dev/null @@ -1,487 +0,0 @@ -# !all names added here must be FQDN's now (T93983) ! - -mira.codfw.wmnet -silver.wikimedia.org -tin.eqiad.wmnet -terbium.eqiad.wmnet - -snapshot1001.eqiad.wmnet -snapshot1002.eqiad.wmnet -snapshot1003.eqiad.wmnet -snapshot1004.eqiad.wmnet -mw1001.eqiad.wmnet -mw1002.eqiad.wmnet -mw1003.eqiad.wmnet -mw1004.eqiad.wmnet -mw1005.eqiad.wmnet -mw1006.eqiad.wmnet -mw1007.eqiad.wmnet -mw1008.eqiad.wmnet -mw1009.eqiad.wmnet -mw1010.eqiad.wmnet -mw1011.eqiad.wmnet -mw1012.eqiad.wmnet -mw1013.eqiad.wmnet -mw1014.eqiad.wmnet -mw1015.eqiad.wmnet -mw1016.eqiad.wmnet -mw1017.eqiad.wmnet -mw1018.eqiad.wmnet -mw1019.eqiad.wmnet -mw1020.eqiad.wmnet -mw1021.eqiad.wmnet -mw1022.eqiad.wmnet -mw1023.eqiad.wmnet -mw1024.eqiad.wmnet -mw1025.eqiad.wmnet -mw1026.eqiad.wmnet -mw1027.eqiad.wmnet -mw1028.eqiad.wmnet -mw1029.eqiad.wmnet -mw1030.eqiad.wmnet -mw1032.eqiad.wmnet -mw1033.eqiad.wmnet -mw1034.eqiad.wmnet -mw1035.eqiad.wmnet -mw1036.eqiad.wmnet -mw1037.eqiad.wmnet -mw1038.eqiad.wmnet -mw1039.eqiad.wmnet -mw1040.eqiad.wmnet -mw1041.eqiad.wmnet -mw1042.eqiad.wmnet -mw1043.eqiad.wmnet -mw1044.eqiad.wmnet -mw1045.eqiad.wmnet -mw1046.eqiad.wmnet -mw1047.eqiad.wmnet -mw1048.eqiad.wmnet -mw1049.eqiad.wmnet -mw1050.eqiad.wmnet -mw1051.eqiad.wmnet -mw1052.eqiad.wmnet -mw1053.eqiad.wmnet -mw1054.eqiad.wmnet -mw1055.eqiad.wmnet -mw1056.eqiad.wmnet -mw1057.eqiad.wmnet -mw1058.eqiad.wmnet -mw1059.eqiad.wmnet -mw1060.eqiad.wmnet -mw1061.eqiad.wmnet -mw1062.eqiad.wmnet -mw1063.eqiad.wmnet -mw1064.eqiad.wmnet -mw1065.eqiad.wmnet -mw1066.eqiad.wmnet -mw1067.eqiad.wmnet -mw1068.eqiad.wmnet -mw1069.eqiad.wmnet -mw1070.eqiad.wmnet -mw1071.eqiad.wmnet -mw1072.eqiad.wmnet -mw1073.eqiad.wmnet -mw1074.eqiad.wmnet -mw1075.eqiad.wmnet -mw1076.eqiad.wmnet -mw1077.eqiad.wmnet -mw1078.eqiad.wmnet -mw1079.eqiad.wmnet -mw1080.eqiad.wmnet -mw1081.eqiad.wmnet -mw1082.eqiad.wmnet -mw1083.eqiad.wmnet -mw1084.eqiad.wmnet -mw1085.eqiad.wmnet -mw1086.eqiad.wmnet -mw1087.eqiad.wmnet -mw1088.eqiad.wmnet -mw1089.eqiad.wmnet -mw1090.eqiad.wmnet -mw1091.eqiad.wmnet -mw1092.eqiad.wmnet -mw1093.eqiad.wmnet -mw1094.eqiad.wmnet -mw1095.eqiad.wmnet -mw1096.eqiad.wmnet -mw1097.eqiad.wmnet -mw1098.eqiad.wmnet -mw1099.eqiad.wmnet -mw1100.eqiad.wmnet -mw1101.eqiad.wmnet -mw1102.eqiad.wmnet -mw1103.eqiad.wmnet -mw1104.eqiad.wmnet -mw1105.eqiad.wmnet -mw1106.eqiad.wmnet -mw1107.eqiad.wmnet -mw1108.eqiad.wmnet -mw1109.eqiad.wmnet -mw1110.eqiad.wmnet -mw1111.eqiad.wmnet -mw1112.eqiad.wmnet -mw1113.eqiad.wmnet -mw1114.eqiad.wmnet -mw1115.eqiad.wmnet -mw1116.eqiad.wmnet -mw1117.eqiad.wmnet -mw1118.eqiad.wmnet -mw1119.eqiad.wmnet -mw1120.eqiad.wmnet -mw1121.eqiad.wmnet -mw1122.eqiad.wmnet -mw1123.eqiad.wmnet -mw1124.eqiad.wmnet -mw1125.eqiad.wmnet -mw1126.eqiad.wmnet -mw1127.eqiad.wmnet -mw1128.eqiad.wmnet -mw1129.eqiad.wmnet -mw1130.eqiad.wmnet -mw1131.eqiad.wmnet -mw1132.eqiad.wmnet -mw1133.eqiad.wmnet -mw1134.eqiad.wmnet -mw1135.eqiad.wmnet -mw1136.eqiad.wmnet -mw1137.eqiad.wmnet -mw1138.eqiad.wmnet -mw1139.eqiad.wmnet -mw1140.eqiad.wmnet -mw1141.eqiad.wmnet -mw1142.eqiad.wmnet -mw1143.eqiad.wmnet -mw1144.eqiad.wmnet -mw1145.eqiad.wmnet -mw1146.eqiad.wmnet -mw1147.eqiad.wmnet -mw1148.eqiad.wmnet -mw1149.eqiad.wmnet -mw1150.eqiad.wmnet -mw1151.eqiad.wmnet -mw1152.eqiad.wmnet -mw1153.eqiad.wmnet -mw1154.eqiad.wmnet -mw1155.eqiad.wmnet -mw1156.eqiad.wmnet -mw1157.eqiad.wmnet -mw1158.eqiad.wmnet -mw1159.eqiad.wmnet -mw1160.eqiad.wmnet -mw1161.eqiad.wmnet -mw1162.eqiad.wmnet -mw1163.eqiad.wmnet -mw1164.eqiad.wmnet -mw1165.eqiad.wmnet -mw1166.eqiad.wmnet -mw1167.eqiad.wmnet -mw1168.eqiad.wmnet -mw1169.eqiad.wmnet -mw1170.eqiad.wmnet -mw1171.eqiad.wmnet -mw1172.eqiad.wmnet -mw1173.eqiad.wmnet -mw1174.eqiad.wmnet -mw1175.eqiad.wmnet -mw1176.eqiad.wmnet -mw1177.eqiad.wmnet -mw1178.eqiad.wmnet -mw1179.eqiad.wmnet -mw1180.eqiad.wmnet -mw1181.eqiad.wmnet -mw1182.eqiad.wmnet -mw1183.eqiad.wmnet -mw1184.eqiad.wmnet -mw1185.eqiad.wmnet -mw1186.eqiad.wmnet -mw1187.eqiad.wmnet -mw1188.eqiad.wmnet -mw1189.eqiad.wmnet -mw1190.eqiad.wmnet -mw1191.eqiad.wmnet -mw1192.eqiad.wmnet -mw1193.eqiad.wmnet -mw1194.eqiad.wmnet -mw1195.eqiad.wmnet -mw1196.eqiad.wmnet -mw1197.eqiad.wmnet -mw1198.eqiad.wmnet -mw1199.eqiad.wmnet -mw1200.eqiad.wmnet -mw1201.eqiad.wmnet -mw1202.eqiad.wmnet -mw1203.eqiad.wmnet -mw1204.eqiad.wmnet -mw1205.eqiad.wmnet -mw1206.eqiad.wmnet -mw1207.eqiad.wmnet -mw1208.eqiad.wmnet -mw1209.eqiad.wmnet -mw1210.eqiad.wmnet -mw1211.eqiad.wmnet -mw1212.eqiad.wmnet -mw1213.eqiad.wmnet -mw1214.eqiad.wmnet -mw1215.eqiad.wmnet -mw1216.eqiad.wmnet -mw1217.eqiad.wmnet -mw1218.eqiad.wmnet -mw1219.eqiad.wmnet -mw1220.eqiad.wmnet -mw1221.eqiad.wmnet -mw1222.eqiad.wmnet -mw1223.eqiad.wmnet -mw1224.eqiad.wmnet -mw1225.eqiad.wmnet -mw1226.eqiad.wmnet -mw1227.eqiad.wmnet -mw1228.eqiad.wmnet -mw1229.eqiad.wmnet -mw1230.eqiad.wmnet -mw1231.eqiad.wmnet -mw1232.eqiad.wmnet -mw1233.eqiad.wmnet -mw1234.eqiad.wmnet -mw1235.eqiad.wmnet -mw1236.eqiad.wmnet -mw1237.eqiad.wmnet -mw1238.eqiad.wmnet -mw1239.eqiad.wmnet -mw1240.eqiad.wmnet -mw1241.eqiad.wmnet -mw1242.eqiad.wmnet -mw1243.eqiad.wmnet -mw1244.eqiad.wmnet -mw1245.eqiad.wmnet -mw1246.eqiad.wmnet -mw1247.eqiad.wmnet -mw1248.eqiad.wmnet -mw1249.eqiad.wmnet -mw1250.eqiad.wmnet -mw1251.eqiad.wmnet -mw1252.eqiad.wmnet -mw1253.eqiad.wmnet -mw1254.eqiad.wmnet -mw1255.eqiad.wmnet -mw1256.eqiad.wmnet -mw1257.eqiad.wmnet -mw1258.eqiad.wmnet -mw1259.eqiad.wmnet -mw1260.eqiad.wmnet - -# codfw -mw2001.codfw.wmnet -mw2002.codfw.wmnet -mw2003.codfw.wmnet -mw2004.codfw.wmnet -mw2005.codfw.wmnet -mw2006.codfw.wmnet -mw2007.codfw.wmnet -mw2008.codfw.wmnet -mw2009.codfw.wmnet -mw2010.codfw.wmnet -mw2011.codfw.wmnet -mw2012.codfw.wmnet -mw2013.codfw.wmnet -mw2014.codfw.wmnet -mw2015.codfw.wmnet -mw2016.codfw.wmnet -mw2017.codfw.wmnet -mw2018.codfw.wmnet -mw2019.codfw.wmnet -mw2020.codfw.wmnet -mw2021.codfw.wmnet -mw2022.codfw.wmnet -mw2023.codfw.wmnet -mw2024.codfw.wmnet -mw2025.codfw.wmnet -mw2026.codfw.wmnet -mw2027.codfw.wmnet -mw2028.codfw.wmnet -mw2029.codfw.wmnet -mw2030.codfw.wmnet -mw2031.codfw.wmnet -mw2032.codfw.wmnet -mw2033.codfw.wmnet -mw2034.codfw.wmnet -mw2035.codfw.wmnet -mw2036.codfw.wmnet -mw2037.codfw.wmnet -mw2038.codfw.wmnet -mw2039.codfw.wmnet -mw2040.codfw.wmnet -mw2041.codfw.wmnet -mw2042.codfw.wmnet -mw2043.codfw.wmnet -mw2044.codfw.wmnet -mw2045.codfw.wmnet -mw2046.codfw.wmnet -mw2047.codfw.wmnet -mw2048.codfw.wmnet -mw2049.codfw.wmnet -#mw2050.codfw.wmnet -mw2051.codfw.wmnet -mw2052.codfw.wmnet -mw2053.codfw.wmnet -mw2054.codfw.wmnet -mw2055.codfw.wmnet -mw2056.codfw.wmnet -mw2057.codfw.wmnet -mw2058.codfw.wmnet -mw2059.codfw.wmnet -mw2060.codfw.wmnet -mw2061.codfw.wmnet -mw2062.codfw.wmnet -mw2063.codfw.wmnet -mw2064.codfw.wmnet -mw2065.codfw.wmnet -mw2066.codfw.wmnet -mw2067.codfw.wmnet -mw2068.codfw.wmnet -mw2069.codfw.wmnet -mw2070.codfw.wmnet -mw2071.codfw.wmnet -mw2072.codfw.wmnet -mw2073.codfw.wmnet -mw2074.codfw.wmnet -mw2075.codfw.wmnet -mw2076.codfw.wmnet -mw2077.codfw.wmnet -mw2078.codfw.wmnet -mw2079.codfw.wmnet -mw2080.codfw.wmnet -mw2081.codfw.wmnet -mw2082.codfw.wmnet -mw2083.codfw.wmnet -mw2084.codfw.wmnet -mw2085.codfw.wmnet -mw2086.codfw.wmnet -mw2087.codfw.wmnet -mw2088.codfw.wmnet -mw2089.codfw.wmnet -mw2090.codfw.wmnet -mw2091.codfw.wmnet -mw2092.codfw.wmnet -mw2093.codfw.wmnet -mw2094.codfw.wmnet -mw2095.codfw.wmnet -mw2096.codfw.wmnet -mw2097.codfw.wmnet -mw2098.codfw.wmnet -mw2099.codfw.wmnet -mw2100.codfw.wmnet -mw2101.codfw.wmnet -mw2102.codfw.wmnet -mw2103.codfw.wmnet -mw2104.codfw.wmnet -mw2105.codfw.wmnet -mw2106.codfw.wmnet -mw2107.codfw.wmnet -mw2108.codfw.wmnet -mw2109.codfw.wmnet -mw2110.codfw.wmnet -mw2111.codfw.wmnet -mw2112.codfw.wmnet -mw2113.codfw.wmnet -mw2114.codfw.wmnet -mw2115.codfw.wmnet -mw2116.codfw.wmnet -mw2117.codfw.wmnet -mw2118.codfw.wmnet -mw2119.codfw.wmnet -mw2120.codfw.wmnet -mw2121.codfw.wmnet -mw2122.codfw.wmnet -mw2123.codfw.wmnet -mw2124.codfw.wmnet -mw2125.codfw.wmnet -mw2126.codfw.wmnet -mw2127.codfw.wmnet -#mw2128.codfw.wmnet -mw2129.codfw.wmnet -mw2130.codfw.wmnet -mw2131.codfw.wmnet -mw2132.codfw.wmnet -mw2133.codfw.wmnet -mw2134.codfw.wmnet -mw2135.codfw.wmnet -mw2136.codfw.wmnet -mw2137.codfw.wmnet -mw2138.codfw.wmnet -mw2139.codfw.wmnet -mw2140.codfw.wmnet -mw2141.codfw.wmnet -mw2142.codfw.wmnet -mw2143.codfw.wmnet -mw2144.codfw.wmnet -mw2145.codfw.wmnet -mw2146.codfw.wmnet -mw2147.codfw.wmnet -mw2148.codfw.wmnet -mw2149.codfw.wmnet -mw2150.codfw.wmnet -mw2151.codfw.wmnet -mw2152.codfw.wmnet -mw2153.codfw.wmnet -mw2154.codfw.wmnet -mw2155.codfw.wmnet -mw2156.codfw.wmnet -mw2157.codfw.wmnet -mw2158.codfw.wmnet -mw2159.codfw.wmnet -mw2160.codfw.wmnet -mw2161.codfw.wmnet -mw2162.codfw.wmnet -mw2163.codfw.wmnet -mw2164.codfw.wmnet -mw2165.codfw.wmnet -mw2166.codfw.wmnet -mw2167.codfw.wmnet -mw2168.codfw.wmnet -mw2169.codfw.wmnet -mw2170.codfw.wmnet -mw2171.codfw.wmnet -mw2172.codfw.wmnet -mw2173.codfw.wmnet -mw2174.codfw.wmnet -mw2175.codfw.wmnet -mw2176.codfw.wmnet -mw2177.codfw.wmnet -mw2178.codfw.wmnet -mw2179.codfw.wmnet -mw2180.codfw.wmnet -mw2181.codfw.wmnet -mw2182.codfw.wmnet -mw2183.codfw.wmnet -mw2184.codfw.wmnet -mw2185.codfw.wmnet -mw2186.codfw.wmnet -#mw2187.codfw.wmnet -mw2188.codfw.wmnet -mw2189.codfw.wmnet -mw2190.codfw.wmnet -mw2191.codfw.wmnet -mw2192.codfw.wmnet -mw2193.codfw.wmnet -mw2194.codfw.wmnet -mw2195.codfw.wmnet -mw2196.codfw.wmnet -mw2197.codfw.wmnet -mw2198.codfw.wmnet -mw2199.codfw.wmnet -mw2200.codfw.wmnet -mw2201.codfw.wmnet -mw2202.codfw.wmnet -mw2203.codfw.wmnet -mw2204.codfw.wmnet -mw2205.codfw.wmnet -mw2206.codfw.wmnet -mw2207.codfw.wmnet -#mw2208.codfw.wmnet -#mw2209.codfw.wmnet -mw2210.codfw.wmnet -mw2211.codfw.wmnet -mw2212.codfw.wmnet -mw2213.codfw.wmnet -mw2214.codfw.wmnet - diff --git a/modules/scap/manifests/dsh.pp b/modules/scap/manifests/dsh.pp index 15ddb72..2b8cb61 100644 --- a/modules/scap/manifests/dsh.pp +++ b/modules/scap/manifests/dsh.pp @@ -4,9 +4,8 @@ # setting up dsh. Useful primarily for monitoring and deploy servers. # # == Paramters: -# [*group_source*] -# Puppet file source for /etc/dsh/group. -# Default 'puppet:///modules/dsh/group' +# [*mediawiki_installation*] +# List of FQDNs for servers to be used as mediawiki installs. Default [] # # [*scap_proxies*] # List of FQDNs for servers to be used as scap rsync proxies. Default [] @@ -15,7 +14,7 @@ # List of FQDNs for servers to be used as scap masters. Default [] # class scap::dsh ( - $group_source = 'puppet:///modules/scap/dsh/group', + $mediawiki_installation = [], $scap_proxies = [], $scap_masters = [], ){ @@ -26,11 +25,17 @@ mode => '0444', } file { '/etc/dsh/group': + ensure => directory, owner => 'root', group => 'root', mode => '0444', - source => $group_source, - recurse => true, + } + + file { '/etc/dsh/group/mediawiki-installation': + content => join($mediawiki_installation, "\n"), + owner => 'root', + group => 'root', + mode => '0444', } file { '/etc/dsh/group/scap-proxies': -- To view, visit https://gerrit.wikimedia.org/r/247324 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I89a8191cb4ef7f0a10597e987f5c5f0b6dbf6aa3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Chad <ch...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits