diff options
| -rwxr-xr-x | ci/02-deploybundle.sh | 4 | ||||
| -rwxr-xr-x | ci/03-maasdeploy.sh | 8 | ||||
| -rwxr-xr-x | ci/cleanvm.sh | 4 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/deployconfig.yaml | 4 | ||||
| -rwxr-xr-x | ci/deploy.sh | 20 | ||||
| -rw-r--r-- | labconfig/lenovo/pod1/labconfig.yaml | 8 |
6 files changed, 30 insertions, 18 deletions
diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh index be11a1f0..974d65ac 100755 --- a/ci/02-deploybundle.sh +++ b/ci/02-deploybundle.sh @@ -118,7 +118,7 @@ case "$opnfvlab" in ;; esac -# lets put the if seperateor as "," as this will save me from world. +# lets put the if separator as "," as this will save me from world. fea="" IFS="," for feature in $opnfvfeature; do @@ -133,7 +133,7 @@ if [[ "$opnfvmodel" = "openstack" ]]; then #update source if trusty is target distribution var=os-$opnfvsdn-$fea-$opnfvtype"-"$opnfvdistro"_"$openstack - if [ "$osdomname" != "None" ]; then + if ([ $osdomname ] && [ $osdomname != "null" ] && [ $osdomname != "None"]); then var=$var"_"publicapi fi else diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index aabed9fa..60ed0855 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -100,8 +100,8 @@ python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, i MAAS_IP=$(grep " ip_address" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //') MAAS_NAME=`grep "maas_name" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'` -API_SERVER="http://$MAAS_IP/MAAS/api/2.0" -API_SERVERMAAS="http://$MAAS_IP/MAAS/" +API_SERVER="http://$MAAS_IP:5240/MAAS/api/2.0" +API_SERVERMAAS="http://$MAAS_IP:5240/MAAS/" PROFILE=ubuntu MY_UPSTREAM_DNS=`grep "upstream_dns" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'` SSH_KEY=`cat ~/.ssh/id_rsa.pub` @@ -215,7 +215,7 @@ installmaas(){ # configuremaas(){ #reconfigure maas with correct MAAS address. - #Below code is needed as MAAS have issue in commisoning without restart. + #Below code is needed as MAAS have issue in commissioning without restart. #sudo ./maas-reconfigure-region.sh $MAAS_IP sleep 30 sudo maas-rack config --region-url http://$MAAS_IP:5240/MAAS @@ -333,7 +333,7 @@ setupspacenetwork(){ fi fi if ([ $type == "admin" ]); then - # If we have a network, we create it + # If we have a network, we create it if ([ $NET_FABRIC_ID ]); then # Set ranges SUBNET_PREFIX=${SPACE_CIDR::-5} diff --git a/ci/cleanvm.sh b/ci/cleanvm.sh index 5a5365b2..df069baf 100755 --- a/ci/cleanvm.sh +++ b/ci/cleanvm.sh @@ -5,7 +5,7 @@ set -x echo " Cleanup Started ..." #use the below commands if you needs to delete the virtual machine -# also along with envuronment destroy. +# also along with environment destroy. ./clean.sh vm_list=$(sudo virsh list --all) @@ -16,7 +16,7 @@ for vm in node1-control node2-compute node3-control node4-control \ do echo "$vm_list" | grep -q " $vm " || continue sudo virsh destroy $vm - sudo virsh undefine $vm + sudo virsh undefine --nvram $vm sudo rm -f /var/lib/libvirt/images/${vm}.qcow2 done diff --git a/ci/config_tpl/juju2/deployconfig.yaml b/ci/config_tpl/juju2/deployconfig.yaml index 844ede6f..bc2e1277 100644 --- a/ci/config_tpl/juju2/deployconfig.yaml +++ b/ci/config_tpl/juju2/deployconfig.yaml @@ -15,12 +15,14 @@ opnfv: {% set netdata_prefix = opnfv.spaces_dict.data.cidr[:-4] %} dataNetwork: {{ opnfv.spaces_dict.data.cidr }} {% endif %} +{% if lab.racks[0].osdomainname is defined %} domain: {{ lab.racks[0].osdomainname }} + os-domain-name: {{ lab.racks[0].osdomainname }} +{% endif %} ext-port: {{ lab.racks[0]['ext-port'] }} ext_port: {{ lab.racks[0]['ext-port'] }} floating-ip-range: {{ lab.racks[0]['floating-ip-range'] }} interface-enable: {{ lab.racks[0].ifnamelist }} - os-domain-name: {{ lab.racks[0].osdomainname }} {% if opnfv.spaces_dict.public is defined %} {% set netpublic_prefix = opnfv.spaces_dict.public.cidr[:-4] %} publicNetwork: {{ opnfv.spaces_dict.public.cidr }} diff --git a/ci/deploy.sh b/ci/deploy.sh index b0aec737..94c7b416 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -2,7 +2,7 @@ set -ex -#need to put mutiple cases here where decide this bundle to deploy by default use the odl bundle. +#need to put multiple cases here where decide this bundle to deploy by default use the odl bundle. # Below parameters are the default and we can according the release opnfvsdn=nosdn @@ -14,6 +14,7 @@ opnfvfeature=none opnfvdistro=xenial opnfvarch=amd64 opnfvmodel=openstack +virtinstall=0 jujuver=`juju --version` @@ -33,9 +34,10 @@ usage() { echo "Usage: $0 [-s <nosdn|odl|opencontrail>] [-d <trusty|xenial>] [-a <amd64>] [-m <openstack|kubernetes>] + [-i <0|1>] [-r <a|b>]" 1>&2 exit 1; } -while getopts ":s:t:o:l:h:r:f:d:a:m:" opt; do +while getopts ":s:t:o:l:h:r:f:d:a:m:i:" opt; do case "${opt}" in s) opnfvsdn=${OPTARG} @@ -64,6 +66,9 @@ while getopts ":s:t:o:l:h:r:f:d:a:m:" opt; do m) opnfvmodel=${OPTARG} ;; + i) + virtinstall=${OPTARG} + ;; h) usage ;; @@ -136,8 +141,8 @@ deploy() { echo " MAAS not deployed please deploy MAAS first." fi fi -#create json file which is missing in case of new deployment after maas and git tree cloned freshly. + #create json file which is missing in case of new deployment after maas and git tree cloned freshly. python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=4)' < labconfig.yaml > labconfig.json python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=4)' < deployconfig.yaml > deployconfig.json @@ -179,7 +184,7 @@ check_status() { retval=0 timeoutiter=0 - echo -n "executing the reltionship within charms ." + echo -n "executing the relationship within charms ." while [ $retval -eq 0 ]; do if juju status | grep -q $waitstatus; then echo -n '.' @@ -204,6 +209,11 @@ check_status() { echo "...... deployment finishing ......." } +# In the case of a virtual deployment +if [ "$virtinstall" -eq 1 ]; then + ./clean.sh || true +fi + echo "...... deployment started ......" deploy @@ -245,7 +255,7 @@ echo "...... configure ......." if ([ $opnfvmodel == "openstack" ]); then ./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true - # creating heat domain after puching the public API into /etc/hosts + # creating heat domain after pushing the public API into /etc/hosts if [[ "$jujuver" > "2" ]]; then status=`juju run-action heat/0 domain-setup` echo $status diff --git a/labconfig/lenovo/pod1/labconfig.yaml b/labconfig/lenovo/pod1/labconfig.yaml index ba56362a..a29282da 100644 --- a/labconfig/lenovo/pod1/labconfig.yaml +++ b/labconfig/lenovo/pod1/labconfig.yaml @@ -39,10 +39,10 @@ lab: nics: - ifname: intf100 spaces: [admin] - mac: ["24:8a:07:3f:95:b6"] + mac: ["24:8a:07:3f:84:c4"] - ifname: intf101 spaces: [floating] - mac: ["24:8a:07:3f:95:b7"] + mac: ["24:8a:07:3f:84:c5"] power: type: ipmi address: 192.0.5.127 @@ -78,8 +78,8 @@ lab: address: 192.0.5.129 user: USERID pass: PASSW0RD - floating-ip-range: 172.21.159.6,172.21.159.100,172.21.159.1,172.21.159.0/24 - ext-port: "br-intf101" + floating-ip-range: 172.21.159.6,172.21.159.100,172.21.159.5,172.21.159.0/24 + ext-port: "intf101" dns: 8.8.8.8 osdomainname: opnfv: |