diff options
| author | Ryan Cook <rcook@redhat.com> | 2017-07-27 16:35:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 16:35:47 -0400 |
| commit | 7a272500a5096749d586b01ba34a7d109e71407c (patch) | |
| tree | 4c43dfdfefcc139249458606c9c4edefc1c38c32 /roles/openstack-stack/tasks/main.yml | |
| parent | c74611e99ec00bd4a3dbb67e972b8deed206fa7d (diff) | |
| parent | 62001e19f4819f8454aa16bb8daedf303217440c (diff) | |
| download | openshift-7a272500a5096749d586b01ba34a7d109e71407c.tar.gz openshift-7a272500a5096749d586b01ba34a7d109e71407c.tar.bz2 openshift-7a272500a5096749d586b01ba34a7d109e71407c.tar.xz openshift-7a272500a5096749d586b01ba34a7d109e71407c.zip | |
Merge branch 'master' into loggin-aws
Diffstat (limited to 'roles/openstack-stack/tasks/main.yml')
| -rw-r--r-- | roles/openstack-stack/tasks/main.yml | 9 |
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: |