From 1eeaf6049704ed80e363224acc44b02fa02e08f2 Mon Sep 17 00:00:00 2001
From: Allen Gao <wanlong.gao@easystack.cn>
Date: Mon, 15 Feb 2016 22:29:58 +0800
Subject: [PATCH] Remove the role path from the template src
The path of the template file under the same role
can easily be omitted, and we are using this omitting
in most places except those this commit is fixing.
TrivialFix
Change-Id: I6d1563e235151669d9d9268d69555aae15e31926
---
ansible/roles/neutron/tasks/config-neutron-fake.yml | 2 +-
ansible/roles/nova/tasks/ceph.yml | 2 +-
ansible/roles/nova/tasks/config-nova-fake.yml | 2 +-
ansible/roles/nova/tasks/config.yml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ansible/roles/neutron/tasks/config-neutron-fake.yml b/ansible/roles/neutron/tasks/config-neutron-fake.yml
index 5f2720e8c..3653a6032 100644
--- a/ansible/roles/neutron/tasks/config-neutron-fake.yml
+++ b/ansible/roles/neutron/tasks/config-neutron-fake.yml
@@ -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:
diff --git a/ansible/roles/nova/tasks/ceph.yml b/ansible/roles/nova/tasks/ceph.yml
index f7fdf959a..3d6dfc363 100644
--- a/ansible/roles/nova/tasks/ceph.yml
+++ b/ansible/roles/nova/tasks/ceph.yml
@@ -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']
diff --git a/ansible/roles/nova/tasks/config-nova-fake.yml b/ansible/roles/nova/tasks/config-nova-fake.yml
index 9992932ac..77311b74d 100644
--- a/ansible/roles/nova/tasks/config-nova-fake.yml
+++ b/ansible/roles/nova/tasks/config-nova-fake.yml
@@ -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 }}
diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml
index b082d1bc4..468eb5682 100644
--- a/ansible/roles/nova/tasks/config.yml
+++ b/ansible/roles/nova/tasks/config.yml
@@ -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"
--
GitLab