From 0bc6983020ff2709f3006c70d19a6fdd548828bb Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 27 Mar 2019 13:58:46 -0700 Subject: Clean up RKE scripts Change-Id: I1508fc314df9a80f09f2dc86194832401f0a7652 Issue-ID: INT-993 Signed-off-by: Gary Wu --- deployment/heat/onap-rke/k8s_vm_install.sh | 2 +- deployment/heat/onap-rke/onap-oom.yaml | 3 + deployment/heat/onap-rke/parts/onap-oom-3.yaml | 3 + deployment/heat/onap-rke/rancher_vm_entrypoint.sh | 75 +++++----- deployment/heat/onap-rke/scripts/deploy.sh | 158 ++-------------------- 5 files changed, 55 insertions(+), 186 deletions(-) (limited to 'deployment') diff --git a/deployment/heat/onap-rke/k8s_vm_install.sh b/deployment/heat/onap-rke/k8s_vm_install.sh index bc538f8d3..ebd4563a9 100644 --- a/deployment/heat/onap-rke/k8s_vm_install.sh +++ b/deployment/heat/onap-rke/k8s_vm_install.sh @@ -50,7 +50,7 @@ sed -i 's|http://archive.ubuntu.com|http://nova.clouds.archive.ubuntu.com|g' /et while ! hash jq &> /dev/null; do apt-get -y update # apt-get -y dist-upgrade - apt-get -y install apt-transport-https ca-certificates curl software-properties-common jq nfs-common docker.io + apt-get -y install curl jq nfs-common docker.io systemctl enable docker usermod -aG docker ubuntu sleep 10 diff --git a/deployment/heat/onap-rke/onap-oom.yaml b/deployment/heat/onap-rke/onap-oom.yaml index c999327b4..6e1f72ac9 100644 --- a/deployment/heat/onap-rke/onap-oom.yaml +++ b/deployment/heat/onap-rke/onap-oom.yaml @@ -881,6 +881,9 @@ resources: user_data: { get_resource: orch_3_vm_config } outputs: + docker_proxy: + value: { get_param: docker_proxy } + rancher_vm_ip: description: The IP address of the rancher instance value: { get_attr: [rancher_floating_ip, floating_ip_address] } diff --git a/deployment/heat/onap-rke/parts/onap-oom-3.yaml b/deployment/heat/onap-rke/parts/onap-oom-3.yaml index 8dc35b68e..3b3cf7022 100644 --- a/deployment/heat/onap-rke/parts/onap-oom-3.yaml +++ b/deployment/heat/onap-rke/parts/onap-oom-3.yaml @@ -1,4 +1,7 @@ outputs: + docker_proxy: + value: { get_param: docker_proxy } + rancher_vm_ip: description: The IP address of the rancher instance value: { get_attr: [rancher_floating_ip, floating_ip_address] } diff --git a/deployment/heat/onap-rke/rancher_vm_entrypoint.sh b/deployment/heat/onap-rke/rancher_vm_entrypoint.sh index 3dfc1bd96..51a3fabbe 100644 --- a/deployment/heat/onap-rke/rancher_vm_entrypoint.sh +++ b/deployment/heat/onap-rke/rancher_vm_entrypoint.sh @@ -85,7 +85,7 @@ sed -i 's|http://archive.ubuntu.com|http://nova.clouds.archive.ubuntu.com|g' /et while ! hash jq &> /dev/null; do apt-get -y update - apt-get -y install apt-transport-https ca-certificates curl software-properties-common jq make nfs-kernel-server moreutils + apt-get -y install curl jq make nfs-kernel-server moreutils sleep 10 done @@ -107,25 +107,23 @@ chmod 777 /dockerdata-nfs/ chown nobody:nogroup /dockerdata-nfs/ cd /dockerdata-nfs/ git init -git config user.email "root@onap" -git config user.name "root" git add -A git commit -m "initial commit" # export NFS mount echo "/dockerdata-nfs *(rw,fsid=1,async,no_root_squash,no_subtree_check)" | tee /etc/exports - - exportfs -a systemctl restart nfs-kernel-server + + cd ~ # install kubectl __kubectl_version__ curl -s -LO https://storage.googleapis.com/kubernetes-release/release/v__kubectl_version__/bin/linux/amd64/kubectl chmod +x ./kubectl sudo mv ./kubectl /usr/local/bin/kubectl -mkdir ~/.kube +mkdir -p ~/.kube # install helm __helm_version__ mkdir -p helm @@ -135,34 +133,10 @@ tar -zxvf helm-v__helm_version__-linux-amd64.tar.gz sudo cp linux-amd64/helm /usr/local/bin/helm popd -NAMESPACE=onap - -# wait for /root/.kube/config to show up -while [ ! -e /root/.kube/config ]; do - sleep 1m -done - - -export KUBECONFIG=/root/.kube/config -kubectl config view -# Enable auto-completion for kubectl -echo "source <(kubectl completion bash)" >> ~/.bashrc - - -# wait for kubernetes to initialze -sleep 3m -until [ $(kubectl get pods --namespace kube-system | tail -n +2 | grep -c Running) -ge 6 ]; do - sleep 1m -done - - -# Install using OOM - - -# Clone OOM: +# Clone OOM repo cd ~ git clone -b __oom_gerrit_branch__ https://gerrit.onap.org/r/oom cd oom @@ -173,7 +147,7 @@ fi git checkout -b workarounds git log -1 -# Clone integration +# Clone integration repo cd ~ git clone -b __integration_gerrit_branch__ https://gerrit.onap.org/r/integration cd integration @@ -202,18 +176,42 @@ git commit -a -m "set portal cookie domain" git tag -a "deploy0" -m "initial deployment" -echo "install tiller/helm" + + + + + +# wait for /root/.kube/config to show up; will be placed by deploy script after RKE completes +while [ ! -e /root/.kube/config ]; do + sleep 1m +done + + +NAMESPACE=onap +export KUBECONFIG=/root/.kube/config +kubectl config set-context $(kubectl config current-context) --namespace=$NAMESPACE +kubectl config view + + +# Enable auto-completion for kubectl +echo "source <(kubectl completion bash)" >> ~/.bashrc + + +until [ $(kubectl get cs | tail -n +2 | grep -c Healthy) -ge 5 ]; do + sleep 1m +done + + +# install tiller/helm kubectl -n kube-system create serviceaccount tiller kubectl create clusterrolebinding tiller --clusterrole=cluster-admin --serviceaccount=kube-system:tiller helm init --service-account tiller kubectl -n kube-system rollout status deploy/tiller-deploy - -# Run ONAP: -cd ~/oom/kubernetes/ -helm init --client-only -helm init --upgrade helm serve & sleep 10 + +# Make ONAP helm charts +cd ~/oom/kubernetes/ helm repo add local http://127.0.0.1:8879 helm repo list make all @@ -226,6 +224,7 @@ if [ ! -z "__helm_deploy_delay__" ]; then sed -i "/\^enabled:/a\ echo sleep __helm_deploy_delay__\n sleep __helm_deploy_delay__" ~/.helm/plugins/deploy/deploy.sh fi +# Deploy ONAP helm deploy dev local/onap -f ~/oom/kubernetes/onap/resources/environments/public-cloud.yaml -f ~/integration-override.yaml --namespace $NAMESPACE --verbose # re-install original helm deploy plugin diff --git a/deployment/heat/onap-rke/scripts/deploy.sh b/deployment/heat/onap-rke/scripts/deploy.sh index c4475b5d5..17113c16a 100755 --- a/deployment/heat/onap-rke/scripts/deploy.sh +++ b/deployment/heat/onap-rke/scripts/deploy.sh @@ -9,7 +9,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 # -stack_name="oom" +stack_name="onap" portal_hostname="portal.api.simpledemo.onap.org" full_deletion=false @@ -111,9 +111,6 @@ SSH_KEY=~/.ssh/onap_key source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh -#SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f -#export OS_PASSWORD_ENCRYPTED=$(echo -n "$OS_PASSWORD" | openssl aes-128-ecb -e -K "$SO_ENCRYPTION_KEY" -nosalt | xxd -c 256 -p) - #Use new encryption method pushd $WORKSPACE/deployment/heat/onap-rke/scripts javac Crypto.java @@ -178,8 +175,7 @@ for VM_NAME in $(grep _vm: ./onap-oom.yaml~ | cut -d: -f1); do done cat > ./cluster.yml~ <> ./cluster.yml~ <