openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix 'node_config_directory' variable bad usage"

Browse Source
This commit is contained in:
Jenkins 2017-04-18 04:02:53 +00:00 committed by Gerrit Code Review
commit 42ef7ddffb
7 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ansible/roles/karbor/tasks/config.yml
View File

@ -29,12 +29,12 @@
service_name: "{{ item.key }}" service_name: "{{ item.key }}"
sources: sources:
- "{{ role_path }}/templates/karbor.conf.j2" - "{{ role_path }}/templates/karbor.conf.j2"
- "{{ node_config_directory }}/config/global.conf" - "{{ node_custom_config }}/global.conf"
- "{{ node_config_directory }}/config/database.conf" - "{{ node_custom_config }}/database.conf"
- "{{ node_config_directory }}/config/messaging.conf" - "{{ node_custom_config }}/messaging.conf"
- "{{ node_config_directory }}/config/karbor.conf" - "{{ node_custom_config }}/karbor.conf"
- "{{ node_config_directory }}/config/karbor/{{ item.key }}.conf" - "{{ node_custom_config }}/karbor/{{ item.key }}.conf"
- "{{ node_config_directory }}/config/karbor/{{ inventory_hostname }}/karbor.conf" - "{{ node_custom_config }}/karbor/{{ inventory_hostname }}/karbor.conf"
dest: "{{ node_config_directory }}/{{ item.key }}/karbor.conf" dest: "{{ node_config_directory }}/{{ item.key }}/karbor.conf"
register: karbor_confs register: karbor_confs
when: when:

12
ansible/roles/murano/tasks/config.yml
View File

@ -22,12 +22,12 @@
service_name: "{{ item }}" service_name: "{{ item }}"
sources: sources:
- "{{ role_path }}/templates/murano.conf.j2" - "{{ role_path }}/templates/murano.conf.j2"
- "{{ node_config_directory }}/config/global.conf" - "{{ node_custom_config }}/global.conf"
- "{{ node_config_directory }}/config/database.conf" - "{{ node_custom_config }}/database.conf"
- "{{ node_config_directory }}/config/messaging.conf" - "{{ node_custom_config }}/messaging.conf"
- "{{ node_config_directory }}/config/murano.conf" - "{{ node_custom_config }}/murano.conf"
- "{{ node_config_directory }}/config/murano/{{ item }}.conf" - "{{ node_custom_config }}/murano/{{ item }}.conf"
- "{{ node_config_directory }}/config/murano/{{ inventory_hostname }}/murano.conf" - "{{ node_custom_config }}/murano/{{ inventory_hostname }}/murano.conf"
dest: "{{ node_config_directory }}/{{ item }}/murano.conf" dest: "{{ node_config_directory }}/{{ item }}/murano.conf"
with_items: with_items:
- "murano-api" - "murano-api"

16
ansible/roles/neutron/tasks/config-neutron-fake.yml
View File

@ -23,12 +23,12 @@
service_name: "{{ item }}" service_name: "{{ item }}"
sources: sources:
- "{{ role_path }}/templates/neutron.conf.j2" - "{{ role_path }}/templates/neutron.conf.j2"
- "{{ node_config_directory }}/config/global.conf" - "{{ node_custom_config }}/global.conf"
- "{{ node_config_directory }}/config/database.conf" - "{{ node_custom_config }}/database.conf"
- "{{ node_config_directory }}/config/messaging.conf" - "{{ node_custom_config }}/messaging.conf"
- "{{ node_config_directory }}/config/neutron.conf" - "{{ node_custom_config }}/neutron.conf"
- "{{ node_config_directory }}/config/neutron/{{ item }}.conf" - "{{ node_custom_config }}/neutron/{{ item }}.conf"
- "{{ node_config_directory }}/config/neutron/{{ inventory_hostname }}/neutron.conf" - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/neutron.conf"
dest: "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/neutron.conf" dest: "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/neutron.conf"
register: fake_neutron_conf register: fake_neutron_conf
with_sequence: start=1 end={{ num_nova_fake_per_node }} with_sequence: start=1 end={{ num_nova_fake_per_node }}
@ -42,8 +42,8 @@
service_name: "{{ item }}" service_name: "{{ item }}"
sources: sources:
- "{{ role_path }}/templates/ml2_conf.ini.j2" - "{{ role_path }}/templates/ml2_conf.ini.j2"
- "{{ node_config_directory }}/config/neutron/ml2_conf.ini" - "{{ node_custom_config }}/neutron/ml2_conf.ini"
- "{{ node_config_directory }}/config/neutron/{{ inventory_hostname }}/neutron.conf" - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/neutron.conf"
dest: "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/ml2_conf.ini" dest: "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/ml2_conf.ini"
register: fake_neutron_ml2_conf_ini register: fake_neutron_ml2_conf_ini
with_sequence: start=1 end={{ num_nova_fake_per_node }} with_sequence: start=1 end={{ num_nova_fake_per_node }}

12
ansible/roles/nova/tasks/config-nova-fake.yml
View File

@ -22,12 +22,12 @@
service_name: "{{ item }}" service_name: "{{ item }}"
sources: sources:
- "{{ role_path }}/templates/nova.conf.j2" - "{{ role_path }}/templates/nova.conf.j2"
- "{{ node_config_directory }}/config/global.conf" - "{{ node_custom_config }}/global.conf"
- "{{ node_config_directory }}/config/database.conf" - "{{ node_custom_config }}/database.conf"
- "{{ node_config_directory }}/config/messaging.conf" - "{{ node_custom_config }}/messaging.conf"
- "{{ node_config_directory }}/config/nova.conf" - "{{ node_custom_config }}/nova.conf"
- "{{ node_config_directory }}/config/nova/{{ item }}.conf" - "{{ node_custom_config }}/nova/{{ item }}.conf"
- "{{ node_config_directory }}/config/nova/{{ inventory_hostname }}/nova.conf" - "{{ node_custom_config }}/nova/{{ inventory_hostname }}/nova.conf"
dest: "{{ node_config_directory }}/nova-compute-fake-{{ item }}/nova.conf" dest: "{{ node_config_directory }}/nova-compute-fake-{{ item }}/nova.conf"
with_sequence: start=1 end={{ num_nova_fake_per_node }} with_sequence: start=1 end={{ num_nova_fake_per_node }}
notify: notify:

14
ansible/roles/octavia/tasks/config.yml
View File

@ -27,12 +27,12 @@
service_name: "{{ item.key }}" service_name: "{{ item.key }}"
sources: sources:
- "{{ role_path }}/templates/octavia.conf.j2" - "{{ role_path }}/templates/octavia.conf.j2"
- "{{ node_config_directory }}/config/global.conf" - "{{ node_custom_config }}/global.conf"
- "{{ node_config_directory }}/config/database.conf" - "{{ node_custom_config }}/database.conf"
- "{{ node_config_directory }}/config/messaging.conf" - "{{ node_custom_config }}/messaging.conf"
- "{{ node_config_directory }}/config/octavia.conf" - "{{ node_custom_config }}/octavia.conf"
- "{{ node_config_directory }}/config/octavia/{{ item.key }}.conf" - "{{ node_custom_config }}/octavia/{{ item.key }}.conf"
- "{{ node_config_directory }}/config/octavia/{{ inventory_hostname }}/octavia.conf" - "{{ node_custom_config }}/octavia/{{ inventory_hostname }}/octavia.conf"
dest: "{{ node_config_directory }}/{{ item.key }}/octavia.conf" dest: "{{ node_config_directory }}/{{ item.key }}/octavia.conf"
register: octavia_confs register: octavia_confs
when: when:
@ -46,7 +46,7 @@
vars: vars:
service: "{{ octavia_services['octavia-worker'] }}" service: "{{ octavia_services['octavia-worker'] }}"
copy: copy:
src: "{{ node_config_directory }}/config/octavia/{{ item }}" src: "{{ node_custom_config }}/octavia/{{ item }}"
dest: "{{ node_config_directory }}/octavia-worker/{{ item }}" dest: "{{ node_config_directory }}/octavia-worker/{{ item }}"
register: octavia_worker_certificate register: octavia_worker_certificate
when: when:

12
ansible/roles/solum/tasks/config.yml
View File

@ -30,12 +30,12 @@
service_name: "{{ item.key }}" service_name: "{{ item.key }}"
sources: sources:
- "{{ role_path }}/templates/solum.conf.j2" - "{{ role_path }}/templates/solum.conf.j2"
- "{{ node_config_directory }}/config/global.conf" - "{{ node_custom_config }}/global.conf"
- "{{ node_config_directory }}/config/database.conf" - "{{ node_custom_config }}/database.conf"
- "{{ node_config_directory }}/config/messaging.conf" - "{{ node_custom_config }}/messaging.conf"
- "{{ node_config_directory }}/config/solum.conf" - "{{ node_custom_config }}/solum.conf"
- "{{ node_config_directory }}/config/solum/{{ item.key }}.conf" - "{{ node_custom_config }}/solum/{{ item.key }}.conf"
- "{{ node_config_directory }}/config/solum/{{ inventory_hostname }}/solum.conf" - "{{ node_custom_config }}/solum/{{ inventory_hostname }}/solum.conf"
dest: "{{ node_config_directory }}/{{ item.key }}/solum.conf" dest: "{{ node_config_directory }}/{{ item.key }}/solum.conf"
register: solum_confs register: solum_confs
when: when:

12
ansible/roles/watcher/tasks/config.yml
View File

@ -29,12 +29,12 @@
service_name: "{{ item.key }}" service_name: "{{ item.key }}"
sources: sources:
- "{{ role_path }}/templates/watcher.conf.j2" - "{{ role_path }}/templates/watcher.conf.j2"
- "{{ node_config_directory }}/config/global.conf" - "{{ node_custom_config }}/global.conf"
- "{{ node_config_directory }}/config/database.conf" - "{{ node_custom_config }}/database.conf"
- "{{ node_config_directory }}/config/messaging.conf" - "{{ node_custom_config }}/messaging.conf"
- "{{ node_config_directory }}/config/watcher.conf" - "{{ node_custom_config }}/watcher.conf"
- "{{ node_config_directory }}/config/watcher/{{ item.key }}.conf" - "{{ node_custom_config }}/watcher/{{ item.key }}.conf"
- "{{ node_config_directory }}/config/watcher/{{ inventory_hostname }}/watcher.conf" - "{{ node_custom_config }}/watcher/{{ inventory_hostname }}/watcher.conf"
dest: "{{ node_config_directory }}/{{ item.key }}/watcher.conf" dest: "{{ node_config_directory }}/{{ item.key }}/watcher.conf"
register: watcher_confs register: watcher_confs
when: when: