openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove hardcode /etc/kolla path"

Browse Source
This commit is contained in:
Jenkins 2017-02-03 09:26:30 +00:00 committed by Gerrit Code Review
commit 57d9224702
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
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

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

@ -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"