openstack
/
devstack-gate
Code Issues Proposed changes

Remove IRONIC_KEY_FILE 

According to codesearch, this variable is not used anywhere.  The
key file is likely to be used by the generic switch driver, so
keep that variable but point it at the standard id_rsa key.  The
ironic_key is merely another copy of it; it's not clear why it
was a different file to start with.

Change-Id: If67c3fa1d7a5823ee0b0fe29c6902d08f336a299
This commit is contained in:
James E. Blair 2017-08-24 08:57:29 -07:00
parent 3c74b1f0ae
commit dc9dffddc2
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devstack-vm-gate.sh
View File

@ -168,13 +168,11 @@ function setup_multinode_connectivity {
localrc_set "$sub_localconf" "IRONIC_VM_NETWORK_BRIDGE" "sub1brbm"
localrc_set "$sub_localconf" "OVS_PHYSICAL_BRIDGE" "sub1brbm"
localrc_set "$sub_localconf" "ENABLE_TENANT_TUNNELS" "False"
localrc_set "$sub_localconf" "IRONIC_KEY_FILE" "$BASE/new/.ssh/ironic_key"
localrc_set "$localconf" "HOST_TOPOLOGY" "multinode"
localrc_set "$localconf" "HOST_TOPOLOGY_ROLE" "primary"
localrc_set "$localconf" "HOST_TOPOLOGY_SUBNODES" "$sub_nodes"
localrc_set "$localconf" "IRONIC_KEY_FILE" "$BASE/new/.ssh/ironic_key"
localrc_set "$localconf" "GENERIC_SWITCH_KEY_FILE" "$BASE/new/.ssh/ironic_key"
localrc_set "$localconf" "GENERIC_SWITCH_KEY_FILE" "$BASE/new/.ssh/id_rsa"
localrc_set "$localconf" "ENABLE_TENANT_TUNNELS" "False"
fi
@ -210,16 +208,6 @@ function setup_multinode_connectivity {
$DSCONF merge_lc /tmp/tmp_sub_localconf "$sub_localconf"
remote_copy_file /tmp/tmp_sub_localconf $NODE:$devstack_dir/local.conf
done
# NOTE(vsaienko) we need to have ssh connection among nodes to manage
# VMs from ironic-conductor or setup networking from networking-generic-switch
if [[ "$DEVSTACK_GATE_IRONIC" -eq '1' ]]; then
echo "Copy ironic key among nodes"
# NOTE(vsaienko) setup_ssh() set 700 to all parent directories when they doesn't
# exist. Keep ironic keys in other directory than /opt/stack/data to avoid setting
# 700 on /opt/stack/data
setup_ssh $BASE/new/.ssh ironic_key
fi
}
function setup_networking {