openstack/trove
Code Issues Proposed changes

Move the iptable change from trovestack to devstack

Browse Source 
Change-Id: I6e10744f86f19f3c29babc07fda77936c95022ff
This commit is contained in:
Lingxian Kong 2019-12-08 18:50:42 +13:00
parent e226ba68ab
commit 4c551947c9
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/plugin.sh
View File

@ -319,6 +319,9 @@ function install_trove {
if is_service_enabled horizon; then
install_trove_dashboard
fi
# Fix iptables rules that prevent amqp connections from the devstack box to the guests
sudo iptables -D openstack-INPUT -j REJECT --reject-with icmp-host-prohibited || true
}
# install_trove_dashboard() - Collect source and prepare

13
integration/scripts/trovestack
View File

@ -810,14 +810,6 @@ function cmd_test_init() {
exclaim "Creating Test Flavors."
add_test_flavors
if [[ -n $KEY_DIR ]]; then
exclaim "Installing the SSH key from $KEY_DIR to the test environment."
mkdir -m 700 -p $USERHOME/.ssh
install -b --mode 0400 $KEY_DIR/id_rsa $USERHOME/.ssh
cat $KEY_DIR/authorized_keys >> $USERHOME/.ssh/authorized_keys
chmod 600 $USERHOME/.ssh/authorized_keys
fi
}
function cmd_build_image() {
@ -1307,12 +1299,7 @@ function cmd_gate_tests() {
# This var is used to ssh into the db instance during the test.
export TROVE_TEST_SSH_KEY_FILE=${SSH_DIR}/id_rsa
# Fix iptables rules that prevent amqp connections from the devstack box to the guests
sudo iptables -D openstack-INPUT -j REJECT --reject-with icmp-host-prohibited || true
sudo chown -R $(whoami) /etc/trove
cd $TROVESTACK_SCRIPTS
local RESTART_TROVE=false
cmd_kick_start "${DATASTORE_TYPE}" "${RESTART_TROVE}"