From c3cefa9996fb67b846f44eed78644a0f52d76df1 Mon Sep 17 00:00:00 2001
From: Tomas Sedovic <tomas@sedovic.cz>
Date: Fri, 2 Jun 2017 14:39:21 +0200
Subject: Move pre_tasks from to the openstack provisioner
We should probably not pollute the role namespace with a name as common
as "common". Moving the pre_task.yml to provisioners/openstack instead.
---
playbooks/provisioning/openstack/pre_tasks.yml | 39 ++++++++++++++++++++++++++
roles/common/pre_tasks/pre_tasks.yml | 38 -------------------------
2 files changed, 39 insertions(+), 38 deletions(-)
create mode 100644 playbooks/provisioning/openstack/pre_tasks.yml
delete mode 100644 roles/common/pre_tasks/pre_tasks.yml
diff --git a/playbooks/provisioning/openstack/pre_tasks.yml b/playbooks/provisioning/openstack/pre_tasks.yml
new file mode 100644
index 000000000..8446bdfbc
--- /dev/null
+++ b/playbooks/provisioning/openstack/pre_tasks.yml
@@ -0,0 +1,39 @@
+---
+- name: Generate Environment ID
+ set_fact:
+ env_random_id: "{{ ansible_date_time.epoch }}"
+ run_once: true
+ delegate_to: localhost
+
+- name: Set default Environment ID
+ set_fact:
+ default_env_id: "casl-{{ lookup('env','OS_USERNAME') }}-{{ env_random_id }}"
+ delegate_to: localhost
+
+- name: Setting Common Facts
+ set_fact:
+ env_id: "{{ env_id | default(default_env_id) }}"
+ delegate_to: localhost
+
+- name: Set Dynamic Inventory Filters
+ become: false
+ shell: >
+ export OS_INV_FILTER_KEY=clusterid && OS_INV_FILTER_VALUE={{ env_id }}
+ delegate_to: localhost
+
+- name: Updating DNS domain to include env_id (if not empty)
+ set_fact:
+ full_dns_domain: "{{ (env_id|trim == '') | ternary(public_dns_domain, env_id + '.' + public_dns_domain) }}"
+ delegate_to: localhost
+
+- name: Set the APP domain for OpenShift use
+ set_fact:
+ openshift_app_domain: "{{ openshift_app_domain | default('apps') }}"
+ delegate_to: localhost
+
+- name: Set the default app domain for routing purposes
+ set_fact:
+ openshift_master_default_subdomain: "{{ openshift_app_domain }}.{{ full_dns_domain }}"
+ delegate_to: localhost
+ when:
+ - openshift_master_default_subdomain is undefined
diff --git a/roles/common/pre_tasks/pre_tasks.yml b/roles/common/pre_tasks/pre_tasks.yml
deleted file mode 100644
index c5e79e89c..000000000
--- a/roles/common/pre_tasks/pre_tasks.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- name: Generate Environment ID
- set_fact:
- env_random_id: "{{ ansible_date_time.epoch }}"
- run_once: true
- delegate_to: localhost
-
-- name: Set default Environment ID
- set_fact:
- default_env_id: "casl-{{ lookup('env','OS_USERNAME') }}-{{ env_random_id }}"
- delegate_to: localhost
-
-- name: Setting Common Facts
- set_fact:
- env_id: "{{ env_id | default(default_env_id) }}"
- delegate_to: localhost
-
-- name: Set Dynamic Inventory Filters
- shell: >
- export OS_INV_FILTER_KEY=clusterid && OS_INV_FILTER_VALUE={{ env_id }}
- delegate_to: localhost
-
-- name: Updating DNS domain to include env_id (if not empty)
- set_fact:
- full_dns_domain: "{{ (env_id|trim == '') | ternary(public_dns_domain, env_id + '.' + public_dns_domain) }}"
- delegate_to: localhost
-
-- name: Set the APP domain for OpenShift use
- set_fact:
- openshift_app_domain: "{{ openshift_app_domain | default('apps') }}"
- delegate_to: localhost
-
-- name: Set the default app domain for routing purposes
- set_fact:
- openshift_master_default_subdomain: "{{ openshift_app_domain }}.{{ full_dns_domain }}"
- delegate_to: localhost
- when:
- - openshift_master_default_subdomain is undefined
--
cgit v1.2.3