Merge "Remove the role path from the template src"

This commit is contained in:
Jenkins 2016-02-29 14:58:21 +00:00 committed by Gerrit Code Review
commit 89eda4d4ee
4 changed files with 4 additions and 4 deletions

View File

@ -9,7 +9,7 @@
- name: Copying over config.json files for services
template:
src: "roles/neutron/templates/neutron-openvswitch-agent.json.j2"
src: "neutron-openvswitch-agent.json.j2"
dest: "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/config.json"
with_sequence: start=1 end={{ num_nova_fake_per_node }}
when:

View File

@ -48,7 +48,7 @@
- name: Pushing secrets xml for libvirt
template:
src: roles/nova/templates/secret.xml.j2
src: "secret.xml.j2"
dest: "{{ node_config_directory }}/nova-libvirt/secrets/{{ rbd_secret_uuid }}.xml"
mode: "0600"
when: inventory_hostname in groups['compute']

View File

@ -8,7 +8,7 @@
- name: Copying over config.json files for services
template:
src: "roles/nova/templates/nova-compute.json.j2"
src: "nova-compute.json.j2"
dest: "{{ node_config_directory }}/nova-compute-fake-{{ item }}/config.json"
with_sequence: start=1 end={{ num_nova_fake_per_node }}

View File

@ -72,5 +72,5 @@
- name: Copying over libvirtd.conf
template:
src: "{{ role_path }}/templates/libvirtd.conf.j2"
src: "libvirtd.conf.j2"
dest: "{{ node_config_directory }}/nova-libvirt/libvirtd.conf"