openstack/kolla-ansible
Code Issues Proposed changes

Remove hardcode /etc/kolla path

Browse Source 
Leaved vagrant and documentation harcoded
/etc/kolla paths due the nature of the files.

Change-Id: Id316980d3d4e8f3de98672d7ed258e0652ed7213
Closes-Bug: #1659771
This commit is contained in:
Eduardo Gonzalez 2017-01-30 16:13:12 +00:00
parent 37f29452b7
commit e50d5cbf4f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/roles/baremetal/tasks/pre-install.yml
View File

@ -116,9 +116,9 @@
become: True become: True
when: ansible_os_family == 'RedHat' when: ansible_os_family == 'RedHat'
- name: Ensure /etc/kolla directory exists - name: Ensure node_config_directory directory exists
file: file:
path: /etc/kolla path: "{{ node_config_directory }}"
state: directory state: directory
recurse: yes recurse: yes
owner: kolla owner: kolla
@ -127,9 +127,9 @@
become: True become: True
when: create_kolla_user | bool when: create_kolla_user | bool
- name: Ensure /etc/kolla directory exists - name: Ensure node_config_directory directory exists
file: file:
path: /etc/kolla path: "{{ node_config_directory }}"
state: directory state: directory
recurse: yes recurse: yes
mode: 0666 mode: 0666

2
ansible/roles/neutron/tasks/config.yml
View File

@ -182,7 +182,7 @@
service_name: "{{ item }}" service_name: "{{ item }}"
sources: sources:
- "{{ role_path }}/templates/vpnaas_agent.ini.j2" - "{{ 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" dest: "{{ node_config_directory }}/{{ item }}/vpnaas_agent.ini"
with_items: with_items:
- "neutron-vpnaas-agent" - "neutron-vpnaas-agent"