summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2017-05-29 19:11:42 +0800
committerSerenaFeng <feng.xiaowei@zte.com.cn>2017-05-29 19:11:42 +0800
commit5d2a14c7c9aef5e31609ae8ebcc16a2485ac8b4d (patch)
tree4f85b1a8eaaeaed4aebd95b3224ff7829a3ab670 /deploy
parent90760673c80a79fd5570d43fb06e0322301f7efc (diff)
bugfix: delete extra firewalls in virtual deployment
Change-Id: I179b5aab51958c0cd4653e65bbd74df5cfd7c53e Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'deploy')
-rwxr-xr-xdeploy/post.sh2
-rw-r--r--deploy/tempest.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/deploy/post.sh b/deploy/post.sh
index df3c280c..3fae69bc 100755
--- a/deploy/post.sh
+++ b/deploy/post.sh
@@ -46,3 +46,5 @@ do
done
python $PYTHONPATH/deploy/post/execute.py -nw $NETWORK
+openstack security group rule create --proto icmp default
+openstack security group rule create --proto tcp --dst-port 22 default
diff --git a/deploy/tempest.py b/deploy/tempest.py
index 3510528a..148e8ba3 100644
--- a/deploy/tempest.py
+++ b/deploy/tempest.py
@@ -217,7 +217,7 @@ def add_host_role(cluster_id, host_id, host_exp_name, host_real_name, vip):
role_lb_update_meta = {'nodes': [host_id],
'cluster_id': cluster_id, 'vip': vip}
client.roles.update(lb_role_id, **role_lb_update_meta)
- if host_exp_name in ['computer01', 'computer02']:
+ if host_exp_name in ['computer01', 'computer02', 'computer03', 'computer04']:
role_computer_update_meta = {'nodes': [host_id],
'cluster_id': cluster_id}
client.roles.update(computer_role_id, **role_computer_update_meta)