From 322bf8e2e9128e0d410f2688e5a8b2f46d3c5243 Mon Sep 17 00:00:00 2001
From: Kevin Carter <kevin.carter@rackspace.com>
Date: Thu, 16 Apr 2015 11:43:09 -0500
Subject: [PATCH] Renamed AIO example files

The AIO example files have been renamed such that they are no longer
creating an issue where the deployer "could" cause problems in
deployment when the AIO configuration files are being used by
default. The issue is ever present when the deployer does a blind
copy of the etc/openstack_deloy directory into /etc/.

This change is to enhance the Kilo gating / deployment process.

Partially implements: blueprint master-kilofication

Change-Id: I0c76ae9012aeafcc8a39a03c0e11b68b2ee5ca9c
---
 etc/openstack_deploy/conf.d/{swift.yml => swift.yml.aio}     | 0
 ...enstack_user_config.yml => openstack_user_config.yml.aio} | 0
 scripts/bootstrap-aio.sh                                     | 5 ++++-
 3 files changed, 4 insertions(+), 1 deletion(-)
 rename etc/openstack_deploy/conf.d/{swift.yml => swift.yml.aio} (100%)
 rename etc/openstack_deploy/{openstack_user_config.yml => openstack_user_config.yml.aio} (100%)

diff --git a/etc/openstack_deploy/conf.d/swift.yml b/etc/openstack_deploy/conf.d/swift.yml.aio
similarity index 100%
rename from etc/openstack_deploy/conf.d/swift.yml
rename to etc/openstack_deploy/conf.d/swift.yml.aio
diff --git a/etc/openstack_deploy/openstack_user_config.yml b/etc/openstack_deploy/openstack_user_config.yml.aio
similarity index 100%
rename from etc/openstack_deploy/openstack_user_config.yml
rename to etc/openstack_deploy/openstack_user_config.yml.aio
diff --git a/scripts/bootstrap-aio.sh b/scripts/bootstrap-aio.sh
index ac427aa7cc..fd53097009 100755
--- a/scripts/bootstrap-aio.sh
+++ b/scripts/bootstrap-aio.sh
@@ -241,8 +241,11 @@ if [ -d "/etc/openstack_deploy" ];then
   rm -rf "/etc/openstack_deploy"
 fi
 
-# Copy the base etc files
+# Move the *.aio files into place for use within the AIO build.
 cp -R etc/openstack_deploy /etc/
+for i in $(find /etc/openstack_deploy/ -type f -name '*.aio');do
+  rename 's/\.aio$//g' $i
+done
 
 # Ensure the conf.d directory exists
 if [ ! -d "/etc/openstack_deploy/conf.d" ];then