From 87552b91be68c80f8004f597ed99b5345a67ad24 Mon Sep 17 00:00:00 2001 From: Lukas Kubin Date: Sat, 21 Jan 2017 19:30:46 +0000 Subject: [PATCH] Change lookup method to correctly load Jinja2 templates. This should resolve two problems: * Ansible cannot find `userdata.j2` due to incorrect path used * Allow the template to be actually rendered as template instead of being loaded as plain file without evaluation There's another solution - simple move of `/roles/apply/templates/` to `/roles/apply/files/templates/`. I have favored this one though to make it possible to use Jinja2 expressions in the template file, which I believe was the original creator's idea. Change-Id: I268e4967597508e15d7de76051e097a43a0bfeac --- .../ansible/shade/lampstack/roles/apply/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workloads/ansible/shade/lampstack/roles/apply/tasks/main.yml b/workloads/ansible/shade/lampstack/roles/apply/tasks/main.yml index 7b472cf..b980652 100755 --- a/workloads/ansible/shade/lampstack/roles/apply/tasks/main.yml +++ b/workloads/ansible/shade/lampstack/roles/apply/tasks/main.yml @@ -76,7 +76,7 @@ timeout: 200 flavor: "{{ app_env.flavor_name }}" network: "{{ app_env.private_net_name }}" - userdata: "{{ lookup('file', 'templates/userdata.j2') }}" + userdata: "{{ lookup('template', 'templates/userdata.j2') }}" config_drive: "{{ app_env.config_drive | default('no') }}" security_groups: lampstack_sg floating_ip_pools: "{{ app_env.public_net_name | default(omit) }}" @@ -109,7 +109,7 @@ timeout: 200 flavor: "{{ app_env.flavor_name }}" network: "{{ app_env.private_net_name }}" - userdata: "{{ lookup('file', 'templates/userdata.j2') }}" + userdata: "{{ lookup('template', 'templates/userdata.j2') }}" config_drive: "{{ app_env.config_drive | default('no') }}" security_groups: lampstack_sg floating_ip_pools: "{{ app_env.public_net_name | default(omit) }}" @@ -154,7 +154,7 @@ flavor: "{{ app_env.flavor_name }}" network: "{{ app_env.private_net_name }}" floating_ip_pools: "{{ app_env.public_net_name | default(omit) }}" - userdata: "{{ lookup('file', 'templates/userdata.j2') }}" + userdata: "{{ lookup('template', 'templates/userdata.j2') }}" config_drive: "{{ app_env.config_drive | default('no') }}" security_groups: lampstack_sg meta: