wallenstein/algo
1
0
Fork 0
mirror of https://github.com/trailofbits/algo.git synced 2025-09-03 02:23:39 +02:00
Code Issues Projects Releases Wiki Activity

GCE server name fix

Browse source
This commit is contained in:
Jack Ivanov 2018-07-31 14:19:58 +03:00
parent 81a0410b81
commit a40ab7fa1d
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
roles/cloud-gce/tasks/main.yml
View file

@ -4,8 +4,8 @@
- name: Network configured - name: Network configured
gce_net: gce_net:
name: "algo-net-{{ server_name }}" name: "algo-net-{{ algo_server_name }}"
fwname: "algo-net-{{ server_name }}-fw" fwname: "algo-net-{{ algo_server_name }}-fw"
allowed: "udp:500,4500,{{ wireguard_port }};tcp:22" allowed: "udp:500,4500,{{ wireguard_port }};tcp:22"
state: "present" state: "present"
mode: auto mode: auto
@ -16,7 +16,7 @@
- name: "Creating a new instance..." - name: "Creating a new instance..."
gce: gce:
instance_names: "{{ server_name }}" instance_names: "{{ algo_server_name }}"
zone: "{{ algo_region }}" zone: "{{ algo_region }}"
machine_type: "{{ cloud_providers.gce.size }}" machine_type: "{{ cloud_providers.gce.size }}"
image: "{{ cloud_providers.gce.image }}" image: "{{ cloud_providers.gce.image }}"
@ -24,7 +24,7 @@
credentials_file: "{{ credentials_file_path }}" credentials_file: "{{ credentials_file_path }}"
project_id: "{{ project_id }}" project_id: "{{ project_id }}"
metadata: '{"ssh-keys":"ubuntu:{{ ssh_public_key_lookup }}"}' metadata: '{"ssh-keys":"ubuntu:{{ ssh_public_key_lookup }}"}'
network: "algo-net-{{ server_name }}" network: "algo-net-{{ algo_server_name }}"
tags: tags:
- "environment-algo" - "environment-algo"
register: google_vm register: google_vm

1
roles/cloud-gce/tasks/prompts.yml
View file

@ -18,7 +18,6 @@
- set_fact: - set_fact:
service_account_email: "{{ credentials_file_lookup.client_email | default(lookup('env','GCE_EMAIL')) }}" service_account_email: "{{ credentials_file_lookup.client_email | default(lookup('env','GCE_EMAIL')) }}"
project_id: "{{ credentials_file_lookup.project_id | default(lookup('env','GCE_PROJECT')) }}" project_id: "{{ credentials_file_lookup.project_id | default(lookup('env','GCE_PROJECT')) }}"
algo_server_name: "{{ server_name | replace('_', '-') }}"
- block: - block:
- name: Get regions - name: Get regions