From 07be558918921815c1ce58b82e4e7a3d57f63e83 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Mon, 3 Sep 2018 15:23:14 +0100
Subject: [PATCH] MNAIO: Only copy the config files/folders required

Currently all the .example and .aio files are copied over,
resulting in a confusing mess. This changes it to just copy
the stuff that is actually used over instead.

Change-Id: Ic6a3beb4d0084507e3017ea1663fd79fda3d1c12
---
 multi-node-aio/playbooks/deploy-osa.yml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/multi-node-aio/playbooks/deploy-osa.yml b/multi-node-aio/playbooks/deploy-osa.yml
index b54921bd..79283977 100644
--- a/multi-node-aio/playbooks/deploy-osa.yml
+++ b/multi-node-aio/playbooks/deploy-osa.yml
@@ -41,24 +41,29 @@
       when:
         - pre_config_osa | default(true) | bool
 
-    - name: Create base directories
+    - name: Create OSA configuration directory
       file:
-        path: "{{ item }}"
+        path: "/etc/openstack_deploy"
         state: directory
         owner: "root"
         group: "root"
         mode: "0755"
-      with_items:
-        - /etc/openstack_deploy
-        - /etc/openstack_deploy/conf.d
-        - /etc/openstack_deploy/env.d
       when:
         - pre_config_osa | default(true) | bool
 
-    - name: Create Basic configs
-      shell: cp -R etc/openstack_deploy/* /etc/openstack_deploy
+    - name: Copy default config files and directories
+      shell: >-
+        rsync
+        -av
+        --include='*.yml'
+        --include='*/'
+        --exclude='*'
+        /opt/openstack-ansible/etc/openstack_deploy/
+        /etc/openstack_deploy/
       args:
+        executable: /bin/bash
         chdir: /opt/openstack-ansible
+        warn: no
       when:
         - pre_config_osa | default(true) | bool