Skip to content

Commit e892991

Browse files
jemrobinsonjemrobinson
authored
Merge pull request #464 from alan-turing-institute/DSG-Turing-SEP2019
Merge September 2019 branch
2 parents b339b9a + 7e70226 commit e892991

8 files changed

Lines changed: 1092 additions & 0 deletions

‎new_dsg_environment/dsg_configs/core/dsg_22_core_config.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"subscriptionName": "Data Study Group 22 (Prod)",
3+
"dsgId": "22",
4+
"shmId": "prod",
5+
"tier": "2",
6+
"domain": "dsgroup22.co.uk",
7+
"netbiosName": "DSGROUP22",
8+
"ipPrefix": "10.250.168.",
9+
"rdsAllowedSources": "193.60.220.253,193.60.220.240",
10+
"computeVmImageType": "Ubuntu",
11+
"computeVmImageVersion": "0.1.2019071900"
12+
}

‎new_dsg_environment/dsg_configs/core/dsg_23_core_config.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"subscriptionName": "Data Study Group 23 (Prod)",
3+
"dsgId": "23",
4+
"shmId": "prod",
5+
"tier": "2",
6+
"domain": "dsgroup23.co.uk",
7+
"netbiosName": "DSGROUP23",
8+
"ipPrefix": "10.250.176.",
9+
"rdsAllowedSources": "193.60.220.253,193.60.220.240",
10+
"computeVmImageType": "Ubuntu",
11+
"computeVmImageVersion": "0.1.2019071900"
12+
}

‎new_dsg_environment/dsg_configs/core/dsg_24_core_config.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"subscriptionName": "Data Study Group 24 (Prod)",
3+
"dsgId": "24",
4+
"shmId": "prod",
5+
"tier": "2",
6+
"domain": "dsgroup24.co.uk",
7+
"netbiosName": "DSGROUP24",
8+
"ipPrefix": "10.250.184.",
9+
"rdsAllowedSources": "193.60.220.253,193.60.220.240",
10+
"computeVmImageType": "Ubuntu",
11+
"computeVmImageVersion": "0.1.2019071900"
12+
}

‎new_dsg_environment/dsg_configs/core/dsg_25_core_config.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"subscriptionName": "Data Study Group 25 (Prod)",
3+
"dsgId": "25",
4+
"shmId": "prod",
5+
"tier": "3",
6+
"domain": "dsgroup25.co.uk",
7+
"netbiosName": "DSGROUP25",
8+
"ipPrefix": "10.250.192.",
9+
"rdsAllowedSources": "193.60.220.253,193.60.220.240",
10+
"computeVmImageType": "Ubuntu",
11+
"computeVmImageVersion": "0.1.2019071900"
12+
}

‎new_dsg_environment/dsg_configs/full/dsg_22_full_config.json‎

Lines changed: 261 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,261 @@
1+
{
2+
"shm": {
3+
"subscriptionName": "Safe Haven Managment",
4+
"id": "prod",
5+
"name": "Safe Haven",
6+
"organisation": {
7+
"name": "The Alan Turing Institute",
8+
"townCity": "London",
9+
"stateCountyRegion": "London",
10+
"countryCode": "GB"
11+
},
12+
"location": "uksouth",
13+
"domain": {
14+
"fqdn": "turingsafehaven.ac.uk",
15+
"netbiosName": "TURINGSAFEHAVEN",
16+
"dn": "DC=turingsafehaven,DC=ac,DC=uk",
17+
"serviceOuPath": "OU=Safe Haven Service Accounts,DC=turingsafehaven,DC=ac,DC=uk",
18+
"userOuPath": "OU=Safe Haven Research Users,DC=turingsafehaven,DC=ac,DC=uk",
19+
"securityOuPath": "OU=Safe Haven Security Groups,DC=turingsafehaven,DC=ac,DC=uk",
20+
"securityGroups": {
21+
"dsvmLdapUsers": {
22+
"name": "SG Data Science LDAP Users",
23+
"description": "SG Data Science LDAP Users"
24+
}
25+
}
26+
},
27+
"network": {
28+
"vnet": {
29+
"rg": "RG_SHM_VNET",
30+
"name": "SHM_VNET1",
31+
"cidr": "10.251.0.0/21"
32+
},
33+
"subnets": {
34+
"identity": {
35+
"prefix": "10.251.0",
36+
"cidr": "10.251.0.0/24"
37+
}
38+
}
39+
},
40+
"dc": {
41+
"rg": "RG_SHM_VM_DC",
42+
"vmName": "SHMDC1",
43+
"hostname": "SHMDC1",
44+
"fqdn": "SHMDC1.turingsafehaven.ac.uk",
45+
"ip": "10.251.0.250"
46+
},
47+
"dcb": {
48+
"vmName": "SHMDC2",
49+
"hostname": "SHMDC2",
50+
"fqdn": "SHMDC2.turingsafehaven.ac.uk",
51+
"ip": "10.251.0.249"
52+
},
53+
"nps": {
54+
"rg": "RG_SHM_NPS",
55+
"vmName": "SHMNPS",
56+
"ip": "10.251.0.248"
57+
},
58+
"storage": {
59+
"artifacts": {
60+
"rg": "RG_DSG_ARTIFACTS",
61+
"accountName": "dsgartifactsprod"
62+
}
63+
},
64+
"keyVault": {
65+
"rg": "RG_DSG_SECRETS",
66+
"name": "dsg-management-prod",
67+
"secretNames": {
68+
"p2sRootCert": "sh-management-p2s-root-cert",
69+
"dc": "sh-managment-dcadmin",
70+
"safemode": "sh-managment-dcsafemode",
71+
"adsync": "sh-managment-adsync",
72+
"vpncertificate": "sh-managment-cert"
73+
}
74+
},
75+
"dns": {
76+
"rg": "RG_SHM_DNS"
77+
}
78+
},
79+
"dsg": {
80+
"subscriptionName": "Data Study Group 22 (Prod)",
81+
"id": "22",
82+
"shortName": "dsg22",
83+
"location": "uksouth",
84+
"tier": "2",
85+
"mirrors": {
86+
"rg": "RG_SHM_PKG_MIRRORS",
87+
"keyVault": {
88+
"name": "kv-shm-pkg-mirrors-prod"
89+
},
90+
"vnet": {
91+
"name": "VNET_SHM_PKG_MIRRORS_TIER2"
92+
},
93+
"cran": {
94+
"ip": "10.20.2.21"
95+
},
96+
"pypi": {
97+
"ip": "10.20.2.20"
98+
}
99+
},
100+
"domain": {
101+
"fqdn": "dsgroup22.co.uk",
102+
"netbiosName": "DSGROUP22",
103+
"dn": "DC=dsgroup22,DC=co,DC=uk",
104+
"securityGroups": {
105+
"serverAdmins": {
106+
"name": "SG DSGROUP22 Server Administrators",
107+
"description": "SG DSGROUP22 Server Administrators"
108+
},
109+
"researchUsers": {
110+
"name": "SG DSGROUP22 Research Users",
111+
"description": "SG DSGROUP22 Research Users"
112+
}
113+
}
114+
},
115+
"network": {
116+
"vnet": {
117+
"rg": "RG_DSG_VNET",
118+
"name": "DSG_DSGROUP22_VNET1",
119+
"cidr": "10.250.168.0/21"
120+
},
121+
"subnets": {
122+
"identity": {
123+
"name": "Subnet-Identity",
124+
"prefix": "10.250.168",
125+
"cidr": "10.250.168.0/24"
126+
},
127+
"rds": {
128+
"name": "Subnet-RDS",
129+
"prefix": "10.250.169",
130+
"cidr": "10.250.169.0/24"
131+
},
132+
"data": {
133+
"name": "Subnet-Data",
134+
"prefix": "10.250.170",
135+
"cidr": "10.250.170.0/24"
136+
},
137+
"gateway": {
138+
"prefix": "10.250.175",
139+
"cidr": "10.250.175.0/27"
140+
}
141+
},
142+
"nsg": {
143+
"data": {
144+
"rg": "RG_DSG_LINUX",
145+
"name": "NSG_Linux_Servers"
146+
}
147+
}
148+
},
149+
"storage": {
150+
"artifacts": {
151+
"rg": "RG_DSG_ARTIFACTS",
152+
"accountName": "dsg22artifacts"
153+
}
154+
},
155+
"keyVault": {
156+
"name": "dsg-management-prod"
157+
},
158+
"dc": {
159+
"rg": "RG_DSG_DC",
160+
"vmName": "DSG22DC",
161+
"hostname": "DSG22DC",
162+
"fqdn": "DSG22DC.dsgroup22.co.uk",
163+
"ip": "10.250.168.250",
164+
"admin": {
165+
"username": "atiadmin",
166+
"passwordSecretName": "dsg22-dc-admin-password"
167+
}
168+
},
169+
"users": {
170+
"ldap": {
171+
"gitlab": {
172+
"name": "DSGROUP22 Gitlab LDAP",
173+
"samAccountName": "dsg22-gitlab-ldap",
174+
"passwordSecretName": "dsg22-gitlab-ldap-password"
175+
},
176+
"hackmd": {
177+
"name": "DSGROUP22 HackMD LDAP",
178+
"samAccountName": "dsg22-hackmd-ldap",
179+
"passwordSecretName": "dsg22-hackmd-ldap-password"
180+
},
181+
"dsvm": {
182+
"name": "DSGROUP22 DSVM LDAP",
183+
"samAccountName": "dsg22-dsvm-ldap",
184+
"passwordSecretName": "dsg22-dsvm-ldap-password"
185+
}
186+
},
187+
"researchers": {
188+
"test": {
189+
"name": "DSGROUP22 Test Researcher",
190+
"samAccountName": "dsg22-test-res",
191+
"passwordSecretName": "dsg22-test-res-password"
192+
}
193+
}
194+
},
195+
"rds": {
196+
"gateway": {
197+
"vmName": "RDS",
198+
"hostname": "RDS",
199+
"fqdn": "RDS.dsgroup22.co.uk",
200+
"ip": "10.250.169.250",
201+
"npsSecretName": "dsg22-nps-secret"
202+
},
203+
"sessionHost1": {
204+
"vmName": "RDSSH1",
205+
"hostname": "RDSSH1",
206+
"fqdn": "RDSSH1.dsgroup22.co.uk",
207+
"ip": "10.250.169.249"
208+
},
209+
"sessionHost2": {
210+
"vmName": "RDSSH2",
211+
"hostname": "RDSSH2",
212+
"fqdn": "RDSSH2.dsgroup22.co.uk",
213+
"ip": "10.250.169.248"
214+
},
215+
"rg": "RG_DSG_RDS",
216+
"nsg": {
217+
"gateway": {
218+
"name": "NSG_RDS_Server",
219+
"allowedSources": "193.60.220.253,193.60.220.240"
220+
},
221+
"sessionHosts": {
222+
"name": "NSG_SessionHosts"
223+
}
224+
}
225+
},
226+
"dataserver": {
227+
"rg": "RG_DSG_DATA",
228+
"vmName": "DATASERVER",
229+
"hostname": "DATASERVER",
230+
"fqdn": "DATASERVER.dsgroup22.co.uk",
231+
"ip": "10.250.170.250"
232+
},
233+
"linux": {
234+
"gitlab": {
235+
"vmName": "GITLAB",
236+
"hostname": "GITLAB",
237+
"fqdn": "GITLAB.dsgroup22.co.uk",
238+
"ip": "10.250.170.151",
239+
"rootPasswordSecretName": "dsg22-gitlab-root-password"
240+
},
241+
"hackmd": {
242+
"vmName": "HACKMD",
243+
"hostname": "HACKMD",
244+
"fqdn": "HACKMD.dsgroup22.co.uk",
245+
"ip": "10.250.170.152"
246+
},
247+
"rg": "RG_DSG_LINUX",
248+
"nsg": "NSG_Linux_Servers"
249+
},
250+
"dsvm": {
251+
"rg": "RG_DSG_COMPUTE",
252+
"vmImageSubscription": "Safe Haven VM Images",
253+
"vmImageType": "Ubuntu",
254+
"vmImageVersion": "0.1.2019071900",
255+
"admin": {
256+
"username": "atiadmin",
257+
"passwordSecretName": "dsgroup22-dsvm-admin-password"
258+
}
259+
}
260+
}
261+
}

0 commit comments

Comments
 (0)