From e50d5cbf4fd6ea201baa1c1f872273c3e9d0423c Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez <dabarren@gmail.com>
Date: Mon, 30 Jan 2017 16:13:12 +0000
Subject: [PATCH] Remove hardcode /etc/kolla path
Leaved vagrant and documentation harcoded
/etc/kolla paths due the nature of the files.
Change-Id: Id316980d3d4e8f3de98672d7ed258e0652ed7213
Closes-Bug: #1659771
---
ansible/roles/baremetal/tasks/pre-install.yml | 8 ++++----
ansible/roles/neutron/tasks/config.yml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ansible/roles/baremetal/tasks/pre-install.yml b/ansible/roles/baremetal/tasks/pre-install.yml
index 470c08b406..590fb2fd52 100644
--- a/ansible/roles/baremetal/tasks/pre-install.yml
+++ b/ansible/roles/baremetal/tasks/pre-install.yml
@@ -116,9 +116,9 @@
become: True
when: ansible_os_family == 'RedHat'
-- name: Ensure /etc/kolla directory exists
+- name: Ensure node_config_directory directory exists
file:
- path: /etc/kolla
+ path: "{{ node_config_directory }}"
state: directory
recurse: yes
owner: kolla
@@ -127,9 +127,9 @@
become: True
when: create_kolla_user | bool
-- name: Ensure /etc/kolla directory exists
+- name: Ensure node_config_directory directory exists
file:
- path: /etc/kolla
+ path: "{{ node_config_directory }}"
state: directory
recurse: yes
mode: 0666
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index 7fbe2d82ae..e46049fb93 100644
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@@ -182,7 +182,7 @@
service_name: "{{ item }}"
sources:
- "{{ role_path }}/templates/vpnaas_agent.ini.j2"
- - "/etc/kolla/config/neutron/vpnaas_agent.ini"
+ - "{{ node_custom_config }}/neutron/vpnaas_agent.ini"
dest: "{{ node_config_directory }}/{{ item }}/vpnaas_agent.ini"
with_items:
- "neutron-vpnaas-agent"
--
GitLab