diff options
| -rw-r--r-- | deployment/heat/onap-oom/parts/onap-oom-1.yaml | 12 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/rancher_vm_entrypoint.sh | 6 | ||||
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/deploy.sh | 3 | ||||
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh | 3 |
4 files changed, 22 insertions, 2 deletions
diff --git a/deployment/heat/onap-oom/parts/onap-oom-1.yaml b/deployment/heat/onap-oom/parts/onap-oom-1.yaml index e29f6cd81..78e6f103b 100644 --- a/deployment/heat/onap-oom/parts/onap-oom-1.yaml +++ b/deployment/heat/onap-oom/parts/onap-oom-1.yaml @@ -32,6 +32,18 @@ parameters: type: string description: Content for integration_override.yaml + gerrit_branch: + type: string + default: "master" + + gerrit_refspec: + type: string + default: "refs/heads/master" + + docker_manifest: + type: string + default: "docker-manifest.csv" + resources: random-str: type: OS::Heat::RandomString diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh index 578cb5129..2f09f69a0 100644 --- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh @@ -47,8 +47,12 @@ apt-get -y update apt-get -y install linux-image-extra-$(uname -r) jq make nfs-kernel-server +# use RAM disk for /dockerdata-nfs for testing +echo "tmpfs /dockerdata-nfs tmpfs noatime,fsid=1 1 2" >> /etc/fstab +mkdir -pv /dockerdata-nfs +mount /dockerdata-nfs + # version control the persistence volume to see what's happening -mkdir -p /dockerdata-nfs/ chmod 777 /dockerdata-nfs/ chown nobody:nogroup /dockerdata-nfs/ cd /dockerdata-nfs/ diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh index e3acd3c95..8a41a78de 100755 --- a/deployment/heat/onap-oom/scripts/deploy.sh +++ b/deployment/heat/onap-oom/scripts/deploy.sh @@ -68,12 +68,13 @@ ssh-keygen -R $RANCHER_IP ssh -o StrictHostKeychecking=no -i $SSH_KEY ubuntu@$RANCHER_IP "sed -u '/Cloud-init.*finished/q' <(tail -n+0 -f /var/log/cloud-init-output.log)" for n in $(seq 1 6); do + echo "Wait count $n of 6" + sleep 15m timeout 15m ssh -i $SSH_KEY ubuntu@$RANCHER_IP 'sudo su -l root -c "/root/oom/kubernetes/robot/ete-k8s.sh onap health"' RESULT=$? if [ $RESULT -eq 0 ]; then break fi - sleep 15m done ROBOT_POD=$(ssh -i $SSH_KEY ubuntu@$RANCHER_IP 'sudo su -c "kubectl --namespace onap get pods"' | grep robot | sed 's/ .*//') if [ "$ROBOT_POD" == "" ]; then 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 23f969c6b..32ccfc55a 100755 --- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh +++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh @@ -50,6 +50,9 @@ cat <<EOF __apt_proxy__: { get_param: apt_proxy } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } __integration_override_yaml__: { get_param: integration_override_yaml } + __gerrit_branch__: { get_param: gerrit_branch } + __gerrit_refspec__: { get_param: gerrit_refspec } + __docker_manifest__: { get_param: docker_manifest } __oam_network_id__: { get_resource: oam_network } __oam_subnet_id__: { get_resource: oam_subnet } __k8s_1_vm_ip__: { get_attr: [k8s_1_floating_ip, floating_ip_address] } |