openstack
/
neutron
Code Issues Proposed changes

Merge "migration: Use ansible-inventory to parse tripleo inventory" into stable/ussuri

This commit is contained in:
Zuul 2020-07-17 04:26:49 +00:00 committed by Gerrit Code Review
parent d18ef34781 c0fba2007c
commit d59bdf6039
1 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
tools/ovn_migration/tripleo_environment/ovn_migration.sh
View File

@ -77,35 +77,23 @@ file again."
get_host_ip() { get_host_ip() {
inventory_file=$1 inventory_file=$1
host_name=$2 host_name=$2
ip=`jq -r --arg role _meta --arg hostname $host_name 'to_entries[] | select(.key == $role) | .value.hostvars[$hostname].ansible_host' $inventory_file` host_vars=$(ansible-inventory -i "$inventory_file" --host "$host_name" 2>/dev/null)
if [[ "x$ip" == "x" ]] || [[ "x$ip" == "xnull" ]]; then if [[ $? -eq 0 ]]; then
# This file does not provide translation from the hostname to the IP, or echo "$host_vars" | jq -r \.ansible_host
# we already have an IP (Queens backwards compatibility)
echo $host_name
else else
echo $ip echo $host_name
fi fi
} }
get_role_hosts() { get_group_hosts() {
inventory_file=$1 inventory_file=$1
role_name=$2 group_name=$2
roles=`jq -r \.$role_name\.children\[\] $inventory_file` group_graph=$(ansible-inventory -i "$inventory_file" --graph "$group_name" 2>/dev/null)
for role in $roles; do if [[ $? -eq 0 ]]; then
# During the rocky cycle the format changed to have .value.hosts echo "$group_graph" | sed -ne 's/^[ \t|]\+--\([a-z0-9\-]\+\)$/\1/p'
hosts=`jq -r --arg role "$role" 'to_entries[] | select(.key == $role) | .value.hosts[]' $inventory_file` else
if [[ "x$hosts" == "x" ]]; then echo ""
# But we keep backwards compatibility with nested childrens (Queens) fi
hosts=`jq -r --arg role "$role" 'to_entries[] | select(.key == $role) | .value.children[]' $inventory_file`
for host in $hosts; do
HOSTS="$HOSTS `jq -r --arg host "$host" 'to_entries[] | select(.key == $host) | .value.hosts[0]' $inventory_file`"
done
else
HOSTS="${hosts} ${HOSTS}"
fi
done
echo $HOSTS
} }
# Generate the ansible.cfg file # Generate the ansible.cfg file
@ -138,11 +126,12 @@ generate_ansible_inventory_file() {
source $STACKRC_FILE source $STACKRC_FILE
echo "[ovn-dbs]" > hosts_for_migration echo "[ovn-dbs]" > hosts_for_migration
ovn_central=True ovn_central=True
/usr/bin/tripleo-ansible-inventory --list > /tmp/ansible-inventory.txt inventory_file=$(mktemp --tmpdir ansible-inventory-XXXXXXXX.yaml)
/usr/bin/tripleo-ansible-inventory --static-yaml-inventory "$inventory_file"
# We want to run ovn_dbs where neutron_api is running # We want to run ovn_dbs where neutron_api is running
OVN_DBS=$(get_role_hosts /tmp/ansible-inventory.txt neutron_api) OVN_DBS=$(get_group_hosts "$inventory_file" neutron_api)
for node_name in $OVN_DBS; do for node_name in $OVN_DBS; do
node_ip=$(get_host_ip /tmp/ansible-inventory.txt $node_name) node_ip=$(get_host_ip "$inventory_file" $node_name)
node="$node_name ansible_host=$node_ip" node="$node_name ansible_host=$node_ip"
if [ "$ovn_central" == "True" ]; then if [ "$ovn_central" == "True" ]; then
ovn_central=False ovn_central=False
@ -155,12 +144,12 @@ generate_ansible_inventory_file() {
echo "[ovn-controllers]" >> hosts_for_migration echo "[ovn-controllers]" >> hosts_for_migration
# We want to run ovn-controller where OVS agent was running before the migration # We want to run ovn-controller where OVS agent was running before the migration
OVN_CONTROLLERS=$(get_role_hosts /tmp/ansible-inventory.txt neutron_ovs_agent) OVN_CONTROLLERS=$(get_group_hosts "$inventory_file" neutron_ovs_agent)
for node_name in $OVN_CONTROLLERS; do for node_name in $OVN_CONTROLLERS; do
node_ip=$(get_host_ip /tmp/ansible-inventory.txt $node_name) node_ip=$(get_host_ip "$inventory_file" $node_name)
echo $node_name ansible_host=$node_ip ansible_ssh_user=heat-admin ansible_become=true ovn_controller=true >> hosts_for_migration echo $node_name ansible_host=$node_ip ansible_ssh_user=heat-admin ansible_become=true ovn_controller=true >> hosts_for_migration
done done
rm -f /tmp/ansible-inventory.txt rm -f "$inventory_file"
echo "" >> hosts_for_migration echo "" >> hosts_for_migration
cat >> hosts_for_migration << EOF cat >> hosts_for_migration << EOF