summaryrefslogtreecommitdiffstats
path: root/roles/openstack-stack/tasks
diff options
context:
space:
mode:
authorBogdan Dobrelya <bdobreli@redhat.com>2017-07-27 15:39:42 +0200
committerGitHub <noreply@github.com>2017-07-27 15:39:42 +0200
commit1b76aeba44ce8cb1120a6659c375fe8b4c87f919 (patch)
tree4c43dfdfefcc139249458606c9c4edefc1c38c32 /roles/openstack-stack/tasks
parent5cbcfd231054b0f64d9bc70064ecdb892cfbaec5 (diff)
parentdf8f5f0e251a014ab30dabd62c17e151b7fe36e8 (diff)
downloadopenshift-1b76aeba44ce8cb1120a6659c375fe8b4c87f919.tar.gz
openshift-1b76aeba44ce8cb1120a6659c375fe8b4c87f919.tar.bz2
openshift-1b76aeba44ce8cb1120a6659c375fe8b4c87f919.tar.xz
openshift-1b76aeba44ce8cb1120a6659c375fe8b4c87f919.zip
Merge pull request #535 from bogdando/bastion_inventory
Options for bastion, SSH config, static inventory autogeneration
Diffstat (limited to 'roles/openstack-stack/tasks')
-rw-r--r--roles/openstack-stack/tasks/main.yml9
1 files changed, 7 insertions, 2 deletions
diff --git a/roles/openstack-stack/tasks/main.yml b/roles/openstack-stack/tasks/main.yml
index a53e6350b..9b4855294 100644
--- a/roles/openstack-stack/tasks/main.yml
+++ b/roles/openstack-stack/tasks/main.yml
@@ -8,7 +8,6 @@
- name: set template paths
set_fact:
stack_template_path: "{{ stack_template_pre.path }}/stack.yaml"
- server_template_path: "{{ stack_template_pre.path }}/server.yaml"
user_data_template_path: "{{ stack_template_pre.path }}/user-data"
- name: generate HOT stack template from jinja2 template
@@ -19,7 +18,13 @@
- name: generate HOT server template from jinja2 template
template:
src: heat_stack_server.yaml.j2
- dest: "{{ server_template_path }}"
+ dest: "{{ stack_template_pre.path }}/server.yaml"
+
+- name: generate HOT server w/o floating IPs template from jinja2 template
+ template:
+ src: heat_stack_server_nofloating.yaml.j2
+ dest: "{{ stack_template_pre.path }}/server_nofloating.yaml"
+ when: use_bastion|bool
- name: generate user_data from jinja2 template
template: