From 4c551947c9983109d494de92275ca4be2d11510d Mon Sep 17 00:00:00 2001
From: Lingxian Kong <anlin.kong@gmail.com>
Date: Sun, 8 Dec 2019 18:50:42 +1300
Subject: [PATCH] Move the iptable change from trovestack to devstack

Change-Id: I6e10744f86f19f3c29babc07fda77936c95022ff
---
 devstack/plugin.sh             |  3 +++
 integration/scripts/trovestack | 13 -------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 6102e9c66b..cef7b7f9f4 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -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
diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack
index dc6235bab4..4aa66a5357 100755
--- a/integration/scripts/trovestack
+++ b/integration/scripts/trovestack
@@ -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}"