From 423914f63f7844d663f8729e247aee6eb0624834 Mon Sep 17 00:00:00 2001
From: Sebastian Haderecker <sebastian.haderecker@gmail.com>
Date: Sat, 13 Feb 2021 18:29:27 +0100
Subject: [PATCH] Unify cloud parameter

---
 cloud/ansible/openstack/deploy_tpot.yaml               |  1 +
 cloud/ansible/openstack/my_os_cloud.yaml               |  2 ++
 .../ansible/openstack/roles/create_net/tasks/main.yaml | 10 +++++-----
 .../ansible/openstack/roles/create_vm/tasks/main.yaml  |  2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 cloud/ansible/openstack/my_os_cloud.yaml

diff --git a/cloud/ansible/openstack/deploy_tpot.yaml b/cloud/ansible/openstack/deploy_tpot.yaml
index 9bcc22a8..02616d5c 100644
--- a/cloud/ansible/openstack/deploy_tpot.yaml
+++ b/cloud/ansible/openstack/deploy_tpot.yaml
@@ -6,6 +6,7 @@
 
 - name: Deploy instance
   hosts: localhost
+  vars_files: my_os_cloud.yaml
   roles:
     - create_net
     - create_vm
diff --git a/cloud/ansible/openstack/my_os_cloud.yaml b/cloud/ansible/openstack/my_os_cloud.yaml
new file mode 100644
index 00000000..d3832f85
--- /dev/null
+++ b/cloud/ansible/openstack/my_os_cloud.yaml
@@ -0,0 +1,2 @@
+# Enter the name of your cloud to use from clouds.yaml
+cloud: open-telekom-cloud
diff --git a/cloud/ansible/openstack/roles/create_net/tasks/main.yaml b/cloud/ansible/openstack/roles/create_net/tasks/main.yaml
index a8b55cd0..c372d8bb 100644
--- a/cloud/ansible/openstack/roles/create_net/tasks/main.yaml
+++ b/cloud/ansible/openstack/roles/create_net/tasks/main.yaml
@@ -1,23 +1,23 @@
 - name: Create security group
   openstack.cloud.security_group:
-    cloud: open-telekom-cloud
+    cloud: "{{ cloud }}"
     name: sg-tpot-any
     description: tpot any-any
 
 - name: Add rules to security group
   openstack.cloud.security_group_rule:
-    cloud: open-telekom-cloud
+    cloud: "{{ cloud }}"
     security_group: sg-tpot-any
     remote_ip_prefix: 0.0.0.0/0
 
 - name: Create network
   openstack.cloud.network:
-    cloud: open-telekom-cloud
+    cloud: "{{ cloud }}"
     name: network-tpot
 
 - name: Create subnet
   openstack.cloud.subnet:
-    cloud: open-telekom-cloud
+    cloud: "{{ cloud }}"
     network_name: network-tpot
     name: subnet-tpot
     cidr: 192.168.0.0/24
@@ -27,7 +27,7 @@
 
 - name: Create router
   openstack.cloud.router:
-    cloud: open-telekom-cloud
+    cloud: "{{ cloud }}"
     name: router-tpot
     interfaces:
       - subnet-tpot
diff --git a/cloud/ansible/openstack/roles/create_vm/tasks/main.yaml b/cloud/ansible/openstack/roles/create_vm/tasks/main.yaml
index 16f9db59..a9e6762e 100644
--- a/cloud/ansible/openstack/roles/create_vm/tasks/main.yaml
+++ b/cloud/ansible/openstack/roles/create_vm/tasks/main.yaml
@@ -4,7 +4,7 @@
 
 - name: Create instance
   openstack.cloud.server:
-    cloud: open-telekom-cloud
+    cloud: "{{ cloud }}"
     name: "{{ tpot_name }}"
     availability_zone: "{{ availability_zone }}"
     image: "{{ image }}"