From c79c156a75f35c3a1242d4e5c2f9b9f8aae3a93f Mon Sep 17 00:00:00 2001 From: milkmix Date: Mon, 24 Jun 2019 13:02:43 +0200 Subject: [PATCH] added missing environment variables --- library/cloudstack_zones.py | 8 ++++---- roles/cloud-cloudstack/tasks/prompts.yml | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/library/cloudstack_zones.py b/library/cloudstack_zones.py index eba1b2b..3e5d9a0 100644 --- a/library/cloudstack_zones.py +++ b/library/cloudstack_zones.py @@ -42,7 +42,7 @@ zone: { "allocationstate": "Enabled", "dhcpprovider": "VirtualRouter", - "id": "1128bd56-b4d9-4ac6-a7b9-c715b187ce11", + "id": "", "localstorageenabled": true, "name": "ch-gva-2", "networktype": "Basic", @@ -53,7 +53,7 @@ zone: { "allocationstate": "Enabled", "dhcpprovider": "VirtualRouter", - "id": "91e5e9e4-c9ed-4b76-bee4-427004b3baf9", + "id": "", "localstorageenabled": true, "name": "ch-dk-2", "networktype": "Basic", @@ -64,7 +64,7 @@ zone: { "allocationstate": "Enabled", "dhcpprovider": "VirtualRouter", - "id": "4da1b188-dcd6-4ff5-b7fd-bde984055548", + "id": "", "localstorageenabled": true, "name": "at-vie-1", "networktype": "Basic", @@ -75,7 +75,7 @@ zone: { "allocationstate": "Enabled", "dhcpprovider": "VirtualRouter", - "id": "35eb7739-d19e-45f7-a581-4687c54d6d02", + "id": "", "localstorageenabled": true, "name": "de-fra-1", "networktype": "Basic", diff --git a/roles/cloud-cloudstack/tasks/prompts.yml b/roles/cloud-cloudstack/tasks/prompts.yml index 547fbd7..07d5d40 100644 --- a/roles/cloud-cloudstack/tasks/prompts.yml +++ b/roles/cloud-cloudstack/tasks/prompts.yml @@ -17,13 +17,12 @@ [exoscale] register: _cs_region - # - name: Parse zones from output - # set_fact: - # _cs_zones: "{{ _cloudstack_zones | from_json }}" - - name: Get zones on cloud cloudstack_zones: register: _cs_zones + environment: + CLOUDSTACK_CONFIG: "{{ _cs_config }}" + CLOUDSTACK_REGION: "{% if _cs_region.user_input | length <= 0 %}{{ 'exoscale' }}{% else %}{{ _cs_region.user_input }}{% endif %}" - name: Extract zones from output set_fact: