Remove kolla-genpwd from setup.cfg

This is now in kolla-ansible
Co-Authored-By: caoyuan <cao.yuan@99cloud.net>

Change-Id: I787a8ba7053f55480125dda64737466300bf7357
This commit is contained in:
Paul Bourke 2017-01-04 11:58:25 +00:00 committed by caoyuan
parent 0c96526de8
commit 10e649a5f8
4 changed files with 0 additions and 152 deletions

View File

@ -26,19 +26,15 @@ packages =
data_files =
share/kolla/docker = docker/*
share/kolla/tools = tools/validate-docker-execute.sh
share/kolla/tools = tools/cleanup-containers
share/kolla/tools = tools/cleanup-host
share/kolla/tools = tools/cleanup-images
share/kolla/tools = tools/start-registry
share/kolla/doc = doc/*
share/kolla/etc_examples = etc/*
share/kolla = tools/openrc-example
share/kolla = setup.cfg
[entry_points]
console_scripts =
kolla-build = kolla.cmd.build:main
kolla-genpwd = kolla.cmd.genpwd:main
oslo.config.opts =
kolla = kolla.opts:list_opts

View File

@ -1,29 +0,0 @@
#!/bin/bash
if [[ $COMPUTE ]] && [[ $(pgrep qemu) ]]; then
echo "Some qemu processes were detected."
echo "Docker will not be able to stop the nova_libvirt container with those running."
echo "Please clean them up before rerunning this script."
exit 1
fi
if [ -n "$1" ]; then
containers_to_kill=($(docker ps | grep -E "$1" | awk '{print $1}'))
volumes_to_remove=($(docker volume ls | grep -E "$1" | awk '{print $1}'))
else
containers_to_kill=$(docker ps --filter "label=kolla_version" --format "{{.Names}}" -a)
volumes_to_remove=$(docker inspect -f '{{range .Mounts}} {{printf "%s\n" .Name }}{{end}}' ${containers_to_kill} | \
egrep -v '(^\s*$)' | sort | uniq)
fi
echo "Stopping containers..."
(docker stop -t 2 ${containers_to_kill} 2>&1) > /dev/null
echo "Removing containers..."
(docker rm -v -f ${containers_to_kill} 2>&1) > /dev/null
echo "Removing volumes..."
(docker volume rm ${volumes_to_remove} 2>&1) > /dev/null
echo "All cleaned up!"

View File

@ -1,70 +0,0 @@
#!/bin/bash
# Move to top level directory
REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")
cd "$(dirname "$REAL_PATH")/.."
. tools/validate-docker-execute.sh
# Spawning the neutron agents containers leaves artifacts on the host.
# This script removes these artifacts.
ip netns list | while read -r line ; do
echo "Removing network namespace $line on the host"
ip netns delete $line
done
ip -o link show | awk -F': ' '/tap/{print $2}' | while read -r ifname ; do
echo "Removing tap interface $ifname on the host"
ip link delete $ifname type veth
done
ip -o link show | awk -F': ' '/brq/{print $2}' | while read -r ifname ; do
echo "Removing linux bridge $ifname on the host"
ip link delete $ifname type bridge
done
ip -o link show | awk -F': ' '/vxlan/{print $2}' | while read -r ifname ; do
echo "Removing vxlan interface $ifname on the host"
ip link delete $ifname type vxlan
done
echo "Removing ovs bridge..."
(docker exec -u root neutron_openvswitch_agent neutron-ovs-cleanup \
--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
--ovs_all_ports) > /dev/null
# Keepalived leaves VIP on the host in case of accidental removal.
# This snippet removes VIPs.
if [[ "$enable_haproxy" == "yes" ]]; then
ip -o addr list | awk '{print $2,$4}' | cut -d/ -f1 | while read -r ifname ifaddr ; do
if [[ "$kolla_internal_vip_address" == "$ifaddr" ||
"$kolla_external_vip_address" == "$ifaddr" ]]; then
echo "Removing VIP $ifaddr on the host"
ip addr delete dev $ifname $ifaddr
fi
done
fi
echo "Creating a fstab backup..."
sudo cp /etc/fstab /etc/fstab_backup
echo "Unmounting Ceph OSD disks"
for mount in $(mount | awk '/\/var\/lib\/ceph/ { print $3 }'); do
umount $mount
done
echo "Removing ceph references from fstab..."
sudo sed -i '/\/var\/lib\/ceph\/osd\//d' /etc/fstab
echo "Getting folders name..."
FOLDER_PATH="/etc/kolla/"
for dir in $FOLDER_PATH*; do
if [ "$dir" == "$FOLDER_PATH""passwords.yml" ] || \
[ "$dir" == "$FOLDER_PATH""globals.yml" ] || \
[ "$dir" == "$FOLDER_PATH""kolla-build.conf" ] || \
[ "$dir" == "$FOLDER_PATH""config" ]; then
echo "Skipping:" $dir
else
rm -rfv $dir
fi
done

View File

@ -1,49 +0,0 @@
# You can customize this to match your environment by replacing the variables:
# keystone_admin_password
# kolla_internal_fqdn
# keystone_admin_port
export OS_PROJECT_DOMAIN_ID=default
export OS_USER_DOMAIN_ID=default
export OS_PROJECT_NAME=admin
export OS_USERNAME=admin
export OS_PASSWORD=<keystone_admin_password>
export OS_AUTH_URL=http://<kolla_internal_fqdn>:<keystone_admin_port>
export OS_IDENTITY_API_VERSION=3
# If you want to connect to the public endpoints of OpenStack
# you can create an openrc by replacing these variables. You
# can also replace the admin username and password with those
# of another user.
# keystone_admin_password
# kolla_external_fqdn
# keystone_public_port
export OS_PROJECT_DOMAIN_ID=default
export OS_USER_DOMAIN_ID=default
export OS_PROJECT_NAME=admin
export OS_USERNAME=admin
export OS_PASSWORD=<keystone_admin_password>
export OS_AUTH_URL=http://<kolla_external_fqdn>:<keystone_public_port>
export OS_IDENTITY_API_VERSION=3
# When you have enabled TLS on the external network of kolla,
# if you want to connect to the public endpoints of OpenStack
# you can create an openrc by replacing these variables. You
# can also replace the admin username and password with those
# of another user.
# keystone_admin_password
# kolla_external_fqdn
# keystone_public_port
# path_to_kolla_external_cacert
export OS_PROJECT_DOMAIN_ID=default
export OS_USER_DOMAIN_ID=default
export OS_PROJECT_NAME=admin
export OS_USERNAME=admin
export OS_PASSWORD=<keystone_admin_password>
export OS_AUTH_URL=https://<kolla_external_fqdn>:<keystone_public_port>
export OS_CACERT=<path_to_kolla_external_cacert>
export OS_IDENTITY_API_VERSION=3