diff options
author | Tomas Sedovic <tomas@sedovic.cz> | 2017-10-18 14:00:50 +0200 |
---|---|---|
committer | Tomas Sedovic <tomas@sedovic.cz> | 2017-10-18 14:00:50 +0200 |
commit | 9f69f214958e1c33bf1c082cd7243dca4e8eebb8 (patch) | |
tree | 8f3f9b8a89729ade9c482b39a8f630636a341b7c /roles/openstack-stack/tasks | |
parent | 255bda6812c53d39723d0ad2b27698e2d627f3bd (diff) | |
parent | 3823c72af11f77b9639176921b398fbab2ac04fd (diff) | |
download | openshift-9f69f214958e1c33bf1c082cd7243dca4e8eebb8.tar.gz openshift-9f69f214958e1c33bf1c082cd7243dca4e8eebb8.tar.bz2 openshift-9f69f214958e1c33bf1c082cd7243dca4e8eebb8.tar.xz openshift-9f69f214958e1c33bf1c082cd7243dca4e8eebb8.zip |
Merge branch 'master' into openstack-docs
Diffstat (limited to 'roles/openstack-stack/tasks')
-rw-r--r-- | roles/openstack-stack/tasks/generate-templates.yml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/roles/openstack-stack/tasks/generate-templates.yml b/roles/openstack-stack/tasks/generate-templates.yml index 110da8444..0ff50a095 100644 --- a/roles/openstack-stack/tasks/generate-templates.yml +++ b/roles/openstack-stack/tasks/generate-templates.yml @@ -20,12 +20,6 @@ src: heat_stack_server.yaml.j2 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: src: user_data.j2 |