From 0ebb67346f1f69f8369ae17296678b2174ef12e5 Mon Sep 17 00:00:00 2001
From: Ryan Hallisey <rhallise@redhat.com>
Date: Thu, 24 Sep 2015 13:36:54 -0400
Subject: [PATCH] Add missing when statments when copying JSON files in ansible

Change-Id: I865b3f4c63520ec318c8b50f4ba60b5715d283ee
Partially-Implements: blueprint replace-config-external
---
 ansible/roles/cinder/tasks/config.yml  | 2 +-
 ansible/roles/neutron/tasks/config.yml | 1 +
 ansible/roles/nova/tasks/config.yml    | 8 ++++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/cinder/tasks/config.yml b/ansible/roles/cinder/tasks/config.yml
index 33fb085142..8112be4698 100644
--- a/ansible/roles/cinder/tasks/config.yml
+++ b/ansible/roles/cinder/tasks/config.yml
@@ -101,4 +101,4 @@
   template:
     src: "roles/cinder/templates/cinder-volume.json.j2"
     dest: "{{ node_config_directory }}/cinder-volume/config.json"
-  when: inventory_hostname in groups['cinder-volume']
\ No newline at end of file
+  when: inventory_hostname in groups['cinder-volume']
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index 541bd29d01..8d138b11c8 100644
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@@ -141,6 +141,7 @@
   template:
     src: "roles/neutron/templates/neutron-server.json.j2"
     dest: "{{ node_config_directory }}/neutron-server/config.json"
+  when: inventory_hostname in groups['neutron-server']
 
 - name: Copying Neutron OpenVSwitch JSON configuration file
   template:
diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml
index fa7183b232..9d5730402b 100644
--- a/ansible/roles/nova/tasks/config.yml
+++ b/ansible/roles/nova/tasks/config.yml
@@ -23,6 +23,7 @@
   template:
     src: "roles/nova/templates/nova-api.json.j2"
     dest: "{{ node_config_directory }}/nova-api/config.json"
+  when: inventory_hostname in groups['nova-api']
 
 - include: ../../config.yml
   vars:
@@ -48,6 +49,7 @@
   template:
     src: "roles/nova/templates/nova-conductor.json.j2"
     dest: "{{ node_config_directory }}/nova-conductor/config.json"
+  when: inventory_hostname in groups['nova-conductor']
 
 - include: ../../config.yml
   vars:
@@ -73,6 +75,7 @@
   template:
     src: "roles/nova/templates/nova-consoleauth.json.j2"
     dest: "{{ node_config_directory }}/nova-consoleauth/config.json"
+  when: inventory_hostname in groups['nova-consoleauth']
 
 - include: ../../config.yml
   vars:
@@ -98,6 +101,7 @@
   template:
     src: "roles/nova/templates/nova-scheduler.json.j2"
     dest: "{{ node_config_directory }}/nova-scheduler/config.json"
+  when: inventory_hostname in groups['nova-scheduler']
 
 - include: ../../config.yml
   vars:
@@ -123,6 +127,7 @@
   template:
     src: "roles/nova/templates/nova-compute.json.j2"
     dest: "{{ node_config_directory }}/nova-compute/config.json"
+  when: inventory_hostname in groups['compute']
 
 - include: ../../config.yml
   vars:
@@ -148,13 +153,16 @@
   template:
     src: "roles/nova/templates/nova-novncproxy.json.j2"
     dest: "{{ node_config_directory }}/nova-novncproxy/config.json"
+  when: inventory_hostname in groups['nova-novncproxy']
 
 - name: Ensuring config directory exists
   file:
     path: "{{ node_config_directory }}/nova-libvirt"
     state: "directory"
+  when: inventory_hostname in groups['compute']
 
 - name: Copying Nova Libvirt JSON configuration file
   template:
     src: "roles/nova/templates/nova-libvirt.json.j2"
     dest: "{{ node_config_directory }}/nova-libvirt/config.json"
+  when: inventory_hostname in groups['compute']