summaryrefslogtreecommitdiffstats
path: root/roles/common/pre_tasks/pre_tasks.yml
diff options
context:
space:
mode:
authorEric Sauer <etsauer@gmail.com>2016-12-21 10:37:40 -0500
committerØystein Bedin <oybed@users.noreply.github.com>2016-12-21 08:37:40 -0700
commit11b48fe4e237950f9d9e9a0e66d8b15f48be1ea0 (patch)
tree37465841228605d501ef1761578856df90e45a22 /roles/common/pre_tasks/pre_tasks.yml
parent953e8a7403f49640c04175386eadda329e9fd4b0 (diff)
downloadopenshift-11b48fe4e237950f9d9e9a0e66d8b15f48be1ea0.tar.gz
openshift-11b48fe4e237950f9d9e9a0e66d8b15f48be1ea0.tar.bz2
openshift-11b48fe4e237950f9d9e9a0e66d8b15f48be1ea0.tar.xz
openshift-11b48fe4e237950f9d9e9a0e66d8b15f48be1ea0.zip
Openstack heat (#2)
* Adding a role to invoke openstack heat * Adding readme * Pulling parameters out to inventory file * start of end-to-end playbook * More enhancements and refactoring to make dynamic inventory the driver for an openshift install * Switching to variable substituted path to config.yaml playbook * Changes to allow defining of number of nodes/infranodes. * Added labels to inventory * Start of end-to-end functionality * Enhancements to support openstack heat provisioning * Updating inventory sample to remove some deprecation warnings * Working towards making the secure-registry role 'become' aware * Fixing node labels and removing secure-registry as it's no longer needed * No longer need insecure registry line, as installer will secure our registry * Adjusted dynamic inventory to filter by clusterid * Minor updates to dynamic inventory bug * Adding a refactored sample inventory directory * Refactoring playbooks for better directory structure, and to narrow down host groups * Adding volume mounts to heat template * Moving dns playbooks back to original location * Fixing incorrect file path * Cleaning up inventory samples * One more hostname to clean up * Changing var name * changed openshift-provision to openshift-prep * Adjusting current provision script to avoid breakage by new openstack-heat code
Diffstat (limited to 'roles/common/pre_tasks/pre_tasks.yml')
-rw-r--r--roles/common/pre_tasks/pre_tasks.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/common/pre_tasks/pre_tasks.yml b/roles/common/pre_tasks/pre_tasks.yml
index 1ba1ea55d..71a989b30 100644
--- a/roles/common/pre_tasks/pre_tasks.yml
+++ b/roles/common/pre_tasks/pre_tasks.yml
@@ -15,6 +15,11 @@
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(dns_domain, env_id + '.' + dns_domain) }}"