commit d844aa96b6bfc1fc4822a7f55b171a9ede625c01
author Alex <osavatieiev@mirantis.com> Fri Mar 19 15:29:40 2021 -0500
committer Alex <osavatieiev@mirantis.com> Fri Mar 19 15:29:40 2021 -0500
tree dbfff634a90de04065065f2969121fc4e8cd85d7
parent ed39e67051ce3b711006da57e43173e8a8a678e1

Updates to K8s related scripts and fixes to scenarios

  Related-PROD: PROD-36128

Change-Id: I098f97cb063229848679669ca881f3c2f09129e9

scripts/cmp_check.sh

diff --git a/scripts/cmp_check.sh b/scripts/cmp_check.sh
index 26e0d76..823c0b4 100644
--- a/scripts/cmp_check.sh
+++ b/scripts/cmp_check.sh
@@ -125,6 +125,7 @@
 function vm_create() {
    [ ! "$silent" = true ] && set -x
    openstack server create --nic net-id=${fixed_net_left_id} --image ${cirros35_id} --flavor ${flavor_tiny_id} --key-name ${keypair_id} --security-group ${secgroup_all_id} --availability-zone ${zone}:${1} ${2} 2>${tmp_out} >/dev/null
+   #openstack server create --nic net-id=${fixed_net_left_id} --image ${ubuntuspt_id} --flavor ${flavor_high_id} --key-name ${keypair_id} --security-group ${secgroup_all_id} --availability-zone ${zone}:${1} ${2} 2>${tmp_out} >/dev/null
    [ ! 0 -eq $? ] && errors+=("${1}/${2}: $(cat ${tmp_out})")
    set +x
    [ ! "$silent" = true ] && cat ${tmp_out}

scripts/prepare.sh

diff --git a/scripts/prepare.sh b/scripts/prepare.sh
index d2f60f2..b79fec7 100644
--- a/scripts/prepare.sh
+++ b/scripts/prepare.sh
@@ -188,7 +188,7 @@
 }
 
 function _project() {
-    echo project create --description \"CVP Pipeline project\" ${project} >>${cmds}
+    echo project create ${project} >>${cmds}
     echo role add --user admin --project ${project} admin >>${cmds}
 }
 
@@ -199,7 +199,7 @@
 }
 
 function _sg_all() {
-    echo security group create --project ${project} --description \"ICMP, SSH, iPerf, HTTP\" ${sg_all} >>${cmds}
+    echo security group create --project ${project} ${sg_all} >>${cmds}
     # icmp
     echo security group rule create --protocol icmp ${sg_all} >>${cmds}
     # ssh
@@ -217,12 +217,12 @@
 }
 
 function _sg_icmp() {
-    echo security group create --project ${project} --description \"ICMP\" ${sg_icmp} >>${cmds}
+    echo security group create --project ${project} ${sg_icmp} >>${cmds}
     echo security group rule create --protocol icmp ${sg_icmp} >>${cmds}
 }
 
 function _sg_ssh() {
-    echo security group create --project ${project} --description \"ICMP, SSH\" ${sg_ssh} >>${cmds}
+    echo security group create --project ${project} ${sg_ssh} >>${cmds}
     # icmp
     echo security group rule create --protocol icmp ${sg_ssh} >>${cmds}
     # ssh
@@ -230,7 +230,7 @@
 }
 
 function _sg_iperf() {
-    echo security group create --project ${project} --description \"ICMP, iPerf\" ${sg_iperf} >>${cmds}
+    echo security group create --project ${project} ${sg_iperf} >>${cmds}
     # icmp
     echo security group rule create --protocol icmp ${sg_iperf} >>${cmds}
     # iperf