Merge "Remove openstack_deploy from teardown.sh deletion list"

This commit is contained in:
Jenkins 2015-10-09 17:34:07 +00:00 committed by Gerrit Code Review
commit 9d7a77720f

View File

@ -25,9 +25,8 @@ cat <<EOF
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
WARNING: This is a destructive action. All containers will be destroyed and WARNING: This is a destructive action. All containers will be destroyed and
all data within the containers will be removed. Some data will be all data within the containers will be removed. Some data will be
removed from the host as well, including all configuration data removed from the host as well. /etc/openstack_deploy will be preserved
within /etc/openstack_deploy/. and may be manually removed if needed.
Please verify that you have backed up all important data prior to Please verify that you have backed up all important data prior to
proceeding with the teardown script. proceeding with the teardown script.
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
@ -194,7 +193,6 @@ pushd playbooks
- /etc/nova - /etc/nova
- /etc/network/interfaces.d/aio_interfaces.cfg - /etc/network/interfaces.d/aio_interfaces.cfg
- /etc/neutron - /etc/neutron
- /etc/openstack_deploy
- /etc/swift - /etc/swift
- /openstack - /openstack
- /opt/*.img - /opt/*.img