adam/windows-ansible
1
0 Fork 0
mirror of https://git.ecdf.ed.ac.uk/win_automation/windows-ansible.git synced 2026-10-26 13:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

proxy VM changes

Browse Source
This commit is contained in:
abrown38 committed 2024-05-31 08:33:33 +01:00
1 parent af4f7c0238
commit e7e193db63
3 files changed
+30 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ansible/playbooks/openstack-vms.yml
+24 -1
View File
@@ -320,4 +320,27 @@
register: common_status2
until: 'common_status2.servers|length == 6'
retries: 100
delay: 60
delay: 60
- name: Create proxy
tags: teardown
os_server:
name: "{{ os_project }}-proxy"
state: "{{ state }}"
image: "{{ proxy_image }}"
flavor: 3661211f-673a-4777-8857-fd243d6c407d
timeout: 900
boot_from_volume: true
volume_size: 40
terminate_volume: yes
key_name: proxy
security_groups:
- proxy
network: "{{ os_network }}"
metadata:
name: "proxy"
win_project: "{{ win_project }}"
type: server
variant: web_proxy
os: linux
when: project_zone == 'protected'
ansible/vars/common.yml
+1
View File
@@ -10,6 +10,7 @@ vm_initial_password: %VM_INITIAL_PASSWORD%
########## Do Not Edit ##########
vm_image: 3f193ea7-321d-418b-a233-da64661b08b1
proxy_image: 62669efd-ee43-4148-848c-b82f49ca2f45
server_vm_flavor: 3661211f-673a-4777-8857-fd243d6c407d
user_vm_flavor: 3661211f-673a-4777-8857-fd243d6c407d
gpu_flavor: 3661211f-673a-4777-8857-fd243d6c407d # CHANGE THIS
ansible/vars/protected.yml
+5 -4
View File
@@ -55,6 +55,8 @@ remote_group_rules:
- { direction: "egress", protocol: "tcp", port_min: 443, port_max: 443, group: "domain_member", remote_group: "chocolatey_server", comment: "Chocolatey HTTPS"}
- { direction: "egress", protocol: "tcp", port_min: 3128, port_max: 3128, group: "user_vms", remote_group: "proxy", comment: "HTTP proxy"}
- { direction: "ingress", protocol: "tcp", port_min: 3128, port_max: 3128, group: "proxy", remote_group: "user_vms", comment: "HTTP proxy"}
remote_ip_rules:
# User VMs
@@ -69,10 +71,9 @@ remote_ip_rules:
- { direction: "egress", protocol: "udp", port_min: 67, port_max: 67, group: "domain_member", remote_ip: "0.0.0.0/0", comment: "DHCP"}
- { direction: "egress", protocol: "tcp", port_min: 1688, port_max: 1688, group: "domain_member", remote_ip: "172.16.26.19/32", comment: "Windows Activation"}
# Proxy
- { direction: "ingress", protocol: "tcp", port_min: 3128, port_max: 3128, group: "proxy", remote_group: "user_vms", comment: "HTTP proxy"}
- { direction: "ingress", protocol: "tcp", port_min: 22, port_max: 22, group: "proxy", remote_group: "10.24.4.71/32", comment: "SSH rundeck 1"}
- { direction: "ingress", protocol: "tcp", port_min: 22, port_max: 22, group: "proxy", remote_group: "10.24.3.172/32", comment: "SSH rundeck 2"}
- { direction: "ingress", protocol: "tcp", port_min: 22, port_max: 22, group: "proxy", remote_group: "10.24.3.242/32", comment: "SSH rundeck 3"}
- { direction: "ingress", protocol: "tcp", port_min: 22, port_max: 22, group: "proxy", remote_ip: "10.24.4.71/32", comment: "SSH rundeck 1"}
- { direction: "ingress", protocol: "tcp", port_min: 22, port_max: 22, group: "proxy", remote_ip: "10.24.3.172/32", comment: "SSH rundeck 2"}
- { direction: "ingress", protocol: "tcp", port_min: 22, port_max: 22, group: "proxy", remote_ip: "10.24.3.242/32", comment: "SSH rundeck 3"}
# ONLY PROTECTED FOR PROXY SSH and http[s]