diff options
| -rw-r--r-- | deployment/heat/onap-oom/onap-oom.yaml | 28 | ||||
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/deploy.sh | 4 | ||||
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh | 10 | ||||
| -rwxr-xr-x | test/ete/scripts/install_openstack_cli.sh | 6 |
4 files changed, 44 insertions, 4 deletions
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index 44bf799ff..c290e17cd 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -383,3 +383,31 @@ outputs: description: The IP address of the rancher instance value: { get_attr: [rancher_floating_ip, floating_ip_address] } + k8s_1_vm_ip: + description: The IP address of the k8s_1 instance + value: { get_attr: [k8s_1_floating_ip, floating_ip_address] } + + k8s_2_vm_ip: + description: The IP address of the k8s_2 instance + value: { get_attr: [k8s_2_floating_ip, floating_ip_address] } + + k8s_3_vm_ip: + description: The IP address of the k8s_3 instance + value: { get_attr: [k8s_3_floating_ip, floating_ip_address] } + + k8s_4_vm_ip: + description: The IP address of the k8s_4 instance + value: { get_attr: [k8s_4_floating_ip, floating_ip_address] } + + k8s_5_vm_ip: + description: The IP address of the k8s_5 instance + value: { get_attr: [k8s_5_floating_ip, floating_ip_address] } + + k8s_6_vm_ip: + description: The IP address of the k8s_6 instance + value: { get_attr: [k8s_6_floating_ip, floating_ip_address] } + + k8s_7_vm_ip: + description: The IP address of the k8s_7 instance + value: { get_attr: [k8s_7_floating_ip, floating_ip_address] } + diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh index a28368212..8ab79a2c8 100755 --- a/deployment/heat/onap-oom/scripts/deploy.sh +++ b/deployment/heat/onap-oom/scripts/deploy.sh @@ -49,5 +49,7 @@ for n in $(seq 1 10); do done ROBOT_POD=$(ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$RANCHER_IP 'sudo su -c "kubectl --namespace onap get pods"' | grep robot | sed 's/ .*//') LOG_DIR=$(ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$RANCHER_IP "sudo su -c \"kubectl exec $ROBOT_POD --namespace onap -- ls -1t /share/logs | head -1\"") -wget --user=robot --password=robot -r -np -nH --cut-dirs=2 -R "index.html*" -P $WORKSPACE/archives/ http://$RANCHER_IP:30209/logs/$LOG_DIR/ + +K8S_IP=$(openstack stack output show onap-oom k8s_1_vm_ip -c output_value -f value) +wget --user=robot --password=robot -r -np -nH --cut-dirs=2 -R "index.html*" -P $WORKSPACE/archives/ http://$K8S_IP:30209/logs/$LOG_DIR/ exit 0 diff --git a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh index 922c7ccb6..19e7b60b1 100755 --- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh +++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh @@ -56,3 +56,13 @@ for VM_NUM in $(seq $NUM_K8S_VMS); do done cat $PARTS_DIR/onap-oom-3.yaml + +for VM_NUM in $(seq $NUM_K8S_VMS); do + K8S_VM_NAME=k8s_$VM_NUM + cat <<EOF + ${K8S_VM_NAME}_vm_ip: + description: The IP address of the ${K8S_VM_NAME} instance + value: { get_attr: [${K8S_VM_NAME}_floating_ip, floating_ip_address] } + +EOF +done diff --git a/test/ete/scripts/install_openstack_cli.sh b/test/ete/scripts/install_openstack_cli.sh index 8f1529606..842034eef 100755 --- a/test/ete/scripts/install_openstack_cli.sh +++ b/test/ete/scripts/install_openstack_cli.sh @@ -24,10 +24,10 @@ else ONAP_VENV=$(mktemp -d --suffix=_onap_venv) virtualenv ${ONAP_VENV} source ${ONAP_VENV}/bin/activate - + pip install --upgrade pip - pip install openstacksdk==0.9.19 python-openstackclient python-heatclient python-designateclient - + pip install python-openstackclient python-heatclient python-designateclient + echo "ONAP_VENV=${ONAP_VENV}" >> $WORKSPACE/env.properties fi echo "ONAP_VENV=${ONAP_VENV}" |