openstack/openstack-ansible
Code Issues Proposed changes

Renamed AIO example files

Browse Source 
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
This commit is contained in:
Kevin Carter 2015-04-16 11:43:09 -05:00
parent f6afdb6985
commit 322bf8e2e9
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
etc/openstack_deploy/conf.d/swift.yml → etc/openstack_deploy/conf.d/swift.yml.aio
View File

0
etc/openstack_deploy/openstack_user_config.yml → etc/openstack_deploy/openstack_user_config.yml.aio
View File

5
scripts/bootstrap-aio.sh
View File

@ -241,8 +241,11 @@ if [ -d "/etc/openstack_deploy" ];then
rm -rf "/etc/openstack_deploy" rm -rf "/etc/openstack_deploy"
fi fi
# Copy the base etc files # Move the *.aio files into place for use within the AIO build.
cp -R etc/openstack_deploy /etc/ 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 # Ensure the conf.d directory exists
if [ ! -d "/etc/openstack_deploy/conf.d" ];then if [ ! -d "/etc/openstack_deploy/conf.d" ];then