openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add missing when statments when copying JSON files in ansible"

Browse Source
This commit is contained in:
Jenkins 2015-09-25 13:53:11 +00:00 committed by Gerrit Code Review
commit d66eaf65e3
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,4 +101,4 @@
template: template:
src: "roles/cinder/templates/cinder-volume.json.j2" src: "roles/cinder/templates/cinder-volume.json.j2"
dest: "{{ node_config_directory }}/cinder-volume/config.json" dest: "{{ node_config_directory }}/cinder-volume/config.json"
when: inventory_hostname in groups['cinder-volume'] when: inventory_hostname in groups['cinder-volume']

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

@ -141,6 +141,7 @@
template: template:
src: "roles/neutron/templates/neutron-server.json.j2" src: "roles/neutron/templates/neutron-server.json.j2"
dest: "{{ node_config_directory }}/neutron-server/config.json" dest: "{{ node_config_directory }}/neutron-server/config.json"
when: inventory_hostname in groups['neutron-server']
- name: Copying Neutron OpenVSwitch JSON configuration file - name: Copying Neutron OpenVSwitch JSON configuration file
template: template:

8
ansible/roles/nova/tasks/config.yml
View File

@ -23,6 +23,7 @@
template: template:
src: "roles/nova/templates/nova-api.json.j2" src: "roles/nova/templates/nova-api.json.j2"
dest: "{{ node_config_directory }}/nova-api/config.json" dest: "{{ node_config_directory }}/nova-api/config.json"
when: inventory_hostname in groups['nova-api']
- include: ../../config.yml - include: ../../config.yml
vars: vars:
@ -48,6 +49,7 @@
template: template:
src: "roles/nova/templates/nova-conductor.json.j2" src: "roles/nova/templates/nova-conductor.json.j2"
dest: "{{ node_config_directory }}/nova-conductor/config.json" dest: "{{ node_config_directory }}/nova-conductor/config.json"
when: inventory_hostname in groups['nova-conductor']
- include: ../../config.yml - include: ../../config.yml
vars: vars:
@ -73,6 +75,7 @@
template: template:
src: "roles/nova/templates/nova-consoleauth.json.j2" src: "roles/nova/templates/nova-consoleauth.json.j2"
dest: "{{ node_config_directory }}/nova-consoleauth/config.json" dest: "{{ node_config_directory }}/nova-consoleauth/config.json"
when: inventory_hostname in groups['nova-consoleauth']
- include: ../../config.yml - include: ../../config.yml
vars: vars:
@ -98,6 +101,7 @@
template: template:
src: "roles/nova/templates/nova-scheduler.json.j2" src: "roles/nova/templates/nova-scheduler.json.j2"
dest: "{{ node_config_directory }}/nova-scheduler/config.json" dest: "{{ node_config_directory }}/nova-scheduler/config.json"
when: inventory_hostname in groups['nova-scheduler']
- include: ../../config.yml - include: ../../config.yml
vars: vars:
@ -123,6 +127,7 @@
template: template:
src: "roles/nova/templates/nova-compute.json.j2" src: "roles/nova/templates/nova-compute.json.j2"
dest: "{{ node_config_directory }}/nova-compute/config.json" dest: "{{ node_config_directory }}/nova-compute/config.json"
when: inventory_hostname in groups['compute']
- include: ../../config.yml - include: ../../config.yml
vars: vars:
@ -148,13 +153,16 @@
template: template:
src: "roles/nova/templates/nova-novncproxy.json.j2" src: "roles/nova/templates/nova-novncproxy.json.j2"
dest: "{{ node_config_directory }}/nova-novncproxy/config.json" dest: "{{ node_config_directory }}/nova-novncproxy/config.json"
when: inventory_hostname in groups['nova-novncproxy']
- name: Ensuring config directory exists - name: Ensuring config directory exists
file: file:
path: "{{ node_config_directory }}/nova-libvirt" path: "{{ node_config_directory }}/nova-libvirt"
state: "directory" state: "directory"
when: inventory_hostname in groups['compute']
- name: Copying Nova Libvirt JSON configuration file - name: Copying Nova Libvirt JSON configuration file
template: template:
src: "roles/nova/templates/nova-libvirt.json.j2" src: "roles/nova/templates/nova-libvirt.json.j2"
dest: "{{ node_config_directory }}/nova-libvirt/config.json" dest: "{{ node_config_directory }}/nova-libvirt/config.json"
when: inventory_hostname in groups['compute']