From a40ab7fa1d30f2a286f4233dd2d9afd929fb6f61 Mon Sep 17 00:00:00 2001 From: Jack Ivanov Date: Tue, 31 Jul 2018 14:19:58 +0300 Subject: [PATCH] GCE server name fix --- roles/cloud-gce/tasks/main.yml | 8 ++++---- roles/cloud-gce/tasks/prompts.yml | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/roles/cloud-gce/tasks/main.yml b/roles/cloud-gce/tasks/main.yml index dd0b0573..8dad0a08 100644 --- a/roles/cloud-gce/tasks/main.yml +++ b/roles/cloud-gce/tasks/main.yml @@ -4,8 +4,8 @@ - name: Network configured gce_net: - name: "algo-net-{{ server_name }}" - fwname: "algo-net-{{ server_name }}-fw" + name: "algo-net-{{ algo_server_name }}" + fwname: "algo-net-{{ algo_server_name }}-fw" allowed: "udp:500,4500,{{ wireguard_port }};tcp:22" state: "present" mode: auto @@ -16,7 +16,7 @@ - name: "Creating a new instance..." gce: - instance_names: "{{ server_name }}" + instance_names: "{{ algo_server_name }}" zone: "{{ algo_region }}" machine_type: "{{ cloud_providers.gce.size }}" image: "{{ cloud_providers.gce.image }}" @@ -24,7 +24,7 @@ credentials_file: "{{ credentials_file_path }}" project_id: "{{ project_id }}" metadata: '{"ssh-keys":"ubuntu:{{ ssh_public_key_lookup }}"}' - network: "algo-net-{{ server_name }}" + network: "algo-net-{{ algo_server_name }}" tags: - "environment-algo" register: google_vm diff --git a/roles/cloud-gce/tasks/prompts.yml b/roles/cloud-gce/tasks/prompts.yml index 0fb279bb..b054cc9e 100644 --- a/roles/cloud-gce/tasks/prompts.yml +++ b/roles/cloud-gce/tasks/prompts.yml @@ -18,7 +18,6 @@ - set_fact: 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')) }}" - algo_server_name: "{{ server_name | replace('_', '-') }}" - block: - name: Get regions