diff options
| -rw-r--r-- | boot/aaf_install.sh | 6 | ||||
| -rw-r--r-- | boot/aaf_vm_init.sh | 18 | ||||
| -rwxr-xr-x | boot/dcae2_install.sh | 59 | ||||
| -rwxr-xr-x | boot/dcae2_vm_init.sh | 236 | ||||
| -rwxr-xr-x | boot/vfc_vm_init.sh | 26 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 22 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 116 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_light.yaml | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_template.env | 22 |
9 files changed, 384 insertions, 125 deletions
diff --git a/boot/aaf_install.sh b/boot/aaf_install.sh index 14363269..4c7c8d7a 100644 --- a/boot/aaf_install.sh +++ b/boot/aaf_install.sh @@ -5,7 +5,9 @@ NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) +GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) +CODE_REPO=$(cat /opt/config/remote_repo.txt) # Add host name to /etc/host to avoid warnings in openstack images if [[ $CLOUD_ENV != "rackspace" ]] @@ -91,4 +93,8 @@ resolvconf -u # Clone Gerrit repository and run docker containers cd /opt +git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO +chmod +x /opt/authz/auth/auth-cass/docker/dinstall.sh +chmod +x /opt/authz/auth/docker/drun.sh +chmod +x /opt/authz/auth/docker/d.props ./aaf_vm_init.sh
\ No newline at end of file diff --git a/boot/aaf_vm_init.sh b/boot/aaf_vm_init.sh index d0f23953..7bc868a8 100644 --- a/boot/aaf_vm_init.sh +++ b/boot/aaf_vm_init.sh @@ -3,4 +3,20 @@ NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) -DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
\ No newline at end of file +DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) + +docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO + +cd /opt/authz +git pull + +sed -i "s/DOCKER_REPOSITORY=.*/DOCKER_REPOSITORY="$NEXUS_DOCKER_REPO"/g" /opt/authz/auth/docker/d.props +sed -i "s/VERSION=.*/VERSION="$DOCKER_IMAGE_VERSION"/g" /opt/authz/auth/docker/d.props + +cd /opt/authz/auth/auth-cass/docker +./dinstall.sh + +sleep 2 + +cd /opt/authz/auth/docker +./drun.sh
\ No newline at end of file diff --git a/boot/dcae2_install.sh b/boot/dcae2_install.sh index 3446b6c2..ac3c3b56 100755 --- a/boot/dcae2_install.sh +++ b/boot/dcae2_install.sh @@ -46,7 +46,9 @@ apt-get update apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget git ntp ntpdate python python-pip # Download scripts from Nexus +if [ ! -e /opt/dcae2_vm_init.sh ]; then curl -k "$NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dcae2_vm_init.sh" -o /opt/dcae2_vm_init.sh +fi curl -k "$NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dcae2_serv.sh" -o /opt/dcae2_serv.sh chmod +x /opt/dcae2_vm_init.sh chmod +x /opt/dcae2_serv.sh @@ -75,13 +77,17 @@ if [ -s /opt/config/external_dns.txt ] then DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) " fi -echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker +echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU --raw-logs -H tcp://0.0.0.0:2376 -H unix:///var/run/docker.sock\"" >> /etc/default/docker cp /lib/systemd/system/docker.service /etc/systemd/system sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service +sed -i "/ExecStart/s/$/ -H tcp:\/\/0.0.0.0:2376 --raw-logs/g" /etc/systemd/system/docker.service systemctl daemon-reload service docker restart +# add hostname aliases +echo "$(cat /opt/config/dcae_ip_addr.txt) consul" >>/etc/hosts +echo "$(cat /opt/config/dcae_ip_addr.txt) dockerhost" >>/etc/hosts # DNS IP address configuration echo "nameserver $DNS_IP_ADDR" >> /etc/resolvconf/resolv.conf.d/head @@ -101,52 +107,5 @@ chmod 777 /opt/app/config/key #cp /opt/config/keystone_url.txt /opt/app/config/keystone_url.txt -URL_ROOT='nexus.onap.org/service/local/repositories/raw/content' -REPO_BLUEPRINTS='org.onap.dcaegen2.platform.blueprints' -REPO_DEPLOYMENTS='org.onap.dcaegen2.deployments' - -if [ -e /opt/config/dcae_deployment_profile.txt ]; then - DEPLOYMENT_PROFILE=$(cat /opt/config/dcae_deployment_profile.txt) -fi -DEPLOYMENT_PROFILE=${DEPLOYMENT_PROFILE:-R1} -if [ "$DEPLOYMENT_PROFILE" == "R1" ]; then - RELEASE_TAG='releases' - # download blueprint input template files - rm -rf /opt/app/inputs-templates - mkdir -p /opt/app/inputs-templates - wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/inputs.yaml - wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/cdapinputs.yaml - wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/phinputs.yaml - wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/dhinputs.yaml - wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/invinputs.yaml - wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/vesinput.yaml - wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/tcainputs.yaml - wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/he-ip.yaml - wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/hr-ip.yaml - - - # generate blueprint input files - pip install --upgrade jinja2 - wget https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/scripts/detemplate-bpinputs.py && \ - (python detemplate-bpinputs.py /opt/config /opt/app/inputs-templates /opt/app/config; rm detemplate-bpinputs.py) - - # Run docker containers - cd /opt - ./dcae2_vm_init.sh -fi - -if [ "$DEPLOYMENT_PROFILE" == "R2MVP" ]; then - RELEASE_TAG='R2' - rm -rf /opt/app/inputs-templates - mkdir -p /opt/app/inputs-templates - wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/${DEPLOYMENT_PROFILE}/docker-compose-1.yaml - wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/${DEPLOYMENT_PROFILE}/docker-compose-2.yaml - - pip install --upgrade jinja2 - wget https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/scripts/detemplate-bpinputs.py && \ - (python detemplate-bpinputs.py /opt/config /opt/app/inputs-templates /opt/app/config; rm detemplate-bpinputs.py) - - cd /opt - ./dcae2_vm_init.sh -fi - +cd /opt +#./dcae2_vm_init.sh diff --git a/boot/dcae2_vm_init.sh b/boot/dcae2_vm_init.sh index ac6713d0..d26bb47a 100755 --- a/boot/dcae2_vm_init.sh +++ b/boot/dcae2_vm_init.sh @@ -595,6 +595,19 @@ list_dns_zone() curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET "${MULTICLOUD_PLUGIN_ENDPOINT}/dns-delegate/v2/zones/${ZONEID}/recordsets" } +################################## start of vm_init ##################################### + +# prepare the configurations needed by DCAEGEN2 installer +rm -rf /opt/app/config +mkdir -p /opt/app/config + + +# private key +sed -e 's/\\n/\n/g' /opt/config/priv_key | sed -e 's/^[ \t]*//g; s/[ \t]*$//g' > /opt/app/config/key +chmod 777 /opt/app/config/key + +# move keystone url file +#cp /opt/config/keystone_url.txt /opt/app/config/keystone_url.txt URL_ROOT='nexus.onap.org/service/local/repositories/raw/content' @@ -614,13 +627,39 @@ ZONE=$(cat /opt/config/rand_str.txt) MYFLOATIP=$(cat /opt/config/dcae_float_ip.txt) MYLOCALIP=$(cat /opt/config/dcae_ip_addr.txt) + # start docker image pulling while we are waiting for A&AI to come online docker login -u "$NEXUS_USER" -p "$NEXUS_PASSWORD" "$NEXUS_DOCKER_REPO" - if [ "$DEPLOYMENT_PROFILE" == "R1" ]; then - docker pull "$NEXUS_DOCKER_REPO/onap/org.onap.dcaegen2.deployments.bootstrap:$DOCKER_VERSION" && docker pull nginx & + RELEASE_TAG='releases' + # download blueprint input template files + rm -rf /opt/app/inputs-templates + mkdir -p /opt/app/inputs-templates + wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/inputs.yaml + wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/cdapinputs.yaml + wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/phinputs.yaml + wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/dhinputs.yaml + wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/invinputs.yaml + wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/vesinput.yaml + wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/tcainputs.yaml + wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/he-ip.yaml + wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_BLUEPRINTS}/${RELEASE_TAG}/input-templates/hr-ip.yaml + + # generate blueprint input files + pip install --upgrade jinja2 + wget https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/scripts/detemplate-bpinputs.py \ + && \ + (python detemplate-bpinputs.py /opt/config /opt/app/inputs-templates /opt/app/config; \ + rm detemplate-bpinputs.py) + + # Run docker containers + cd /opt + + + docker pull "$NEXUS_DOCKER_REPO/onap/org.onap.dcaegen2.deployments.bootstrap:$DOCKER_VERSION" \ + && docker pull nginx & ######################################### # Wait for then register with A&AI @@ -666,25 +705,40 @@ if [ "$DEPLOYMENT_PROFILE" == "R1" ]; then # start proxy for consul's health check CONSULIP=$(head -1 /opt/app/config/runtime.ip.consul | sed 's/[[:space:]]//g') echo "Consul is available at $CONSULIP" - - cat >./nginx.conf <<EOL -server { - listen 80; - server_name dcae.simpledemo.onap.org; - location /healthcheck { - proxy_pass http://${CONSULIP}:8500/v1/health/state/passing; - } -} -EOL - docker run --name dcae-proxy -p 8080:80 -v "$(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf" -d nginx - echo "Healthcheck API available at http://${MYFLOATIP}:8080/healthcheck" - echo " or http://${MYLOCALIP}:8080/healthcheck" - fi +if [[ $DEPLOYMENT_PROFILE == R2* ]]; then + RELEASE_TAG='R2' + set +e + rm -rf /opt/app/inputs-templates + mkdir -p /opt/app/inputs-templates + wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/docker-compose-1.yaml + wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/docker-compose-2.yaml + wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/docker-compose-3.yaml + wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/docker-compose-4.yaml + wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/register.sh + wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/setup.sh + wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/build-plugins.sh + + pip install --upgrade jinja2 + wget https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/scripts/detemplate-bpinputs.py \ + && \ + (python detemplate-bpinputs.py /opt/config /opt/app/inputs-templates /opt/app/config; \ + rm detemplate-bpinputs.py) + + if [ -e /opt/app/config/register.sh ]; then + chmod +x /opt/app/config/register.sh + fi + if [ -e /opt/app/config/setup.sh ]; then + chmod +x /opt/app/config/setup.sh + fi + if [ -e /opt/app/config/build-plugins.sh ]; then + chmod +x /opt/app/config/build-plugins.sh + fi + set -e -if [ "$DEPLOYMENT_PROFILE" == "R2MVP" ]; then cd /opt/app/config + # deploy essentials /opt/docker/docker-compose -f docker-compose-1.yaml up -d echo "Waiting for Consul to come up ready" while ! nc -z localhost 8500; do sleep 1; done @@ -695,48 +749,116 @@ if [ "$DEPLOYMENT_PROFILE" == "R2MVP" ]; then echo "All dependencies are up, proceed to the next phase" sleep 5 - NAME='config_binding_service' - PORT='10000' - ID=$(sudo docker ps |grep "$NAME" |cut -b1-12) - while [ -z "$ID" ]; do echo "Waiting for $NAME container to be deployed"; sleep 1; ID=$(sudo docker ps |grep "$NAME" |cut -b1-12); done - REG='{"ID": "'"$NAME"'0", "Name": "'"$NAME"'", "Address": "'"$NAME"'", "Port": '"$PORT"'}' - curl -v -X PUT -H "Content-Type: application/json" --data "${REG}" http://localhost:8500/v1/agent/service/register + echo "Setup CloudifyManager and Registrator" + ./setup.sh + ./register.sh - sleep 5 - echo "Now bring up DCAE service components" + echo "Bring up DCAE MIN service components for R2 use cases" /opt/docker/docker-compose -f docker-compose-2.yaml up -d - - NAME='ves' - PORT='8080' - echo "Registering for $NAME:$PORT" - ID=$(sudo docker ps |grep "$NAME" |cut -b1-12) - while [ -z "$ID" ]; do echo "Waiting for $NAME container to be deployed"; sleep 1; ID=$(sudo docker ps |grep "$NAME" |cut -b1-12); done - REG='{"ID": "'"$NAME"'", "Name": "'"$NAME"'", "Address": "'"$NAME"'", "Port": '"$PORT"'}' - curl -v -X PUT -H "Content-Type: application/json" --data "${REG}" http://localhost:8500/v1/agent/service/register - - NAME='tca' - PORT='11011' - echo "Registering for $NAME:$PORT" - ID=$(sudo docker ps |grep "$NAME" |cut -b1-12) - while [ -z "$ID" ]; do echo "Waiting for $NAME container to be deployed"; sleep 1; ID=$(sudo docker ps |grep "$NAME" |cut -b1-12); done - REG='{"ID": "'"$NAME"'", "Name": "'"$NAME"'", "Address": "'"$NAME"'", "Port": '"$PORT"'}' - curl -v -X PUT -H "Content-Type: application/json" --data "${REG}" http://localhost:8500/v1/agent/service/register - - NAME='hr' - PORT='9101' - echo "Registering for $NAME:$PORT" - ID=$(sudo docker ps |grep "$NAME" |cut -b1-12) - while [ -z "$ID" ]; do echo "Waiting for $NAME container to be deployed"; sleep 1; ID=$(sudo docker ps |grep "$NAME" |cut -b1-12); done - REG='{"ID": "'"$NAME"'", "Name": "'"$NAME"'", "Address": "'"$NAME"'", "Port": '"$PORT"'}' - curl -v -X PUT -H "Content-Type: application/json" --data "${REG}" http://localhost:8500/v1/agent/service/register - - NAME='he' - PORT='9102' - echo "Registering for $NAME:$PORT" - ID=$(sudo docker ps |grep "$NAME" |cut -b1-12) - while [ -z "$ID" ]; do echo "Waiting for $NAME container to be deployed"; sleep 1; ID=$(sudo docker ps |grep "$NAME" |cut -b1-12); done - REG='{"ID": "'"$NAME"'", "Name": "'"$NAME"'", "Address": "'"$NAME"'", "Port": '"$PORT"'}' - curl -v -X PUT -H "Content-Type: application/json" --data "${REG}" http://localhost:8500/v1/agent/service/register + if [[ "$DEPLOYMENT_PROFILE" == "R2" || "$DEPLOYMENT_PROFILE" == "R2PLUS" ]]; then + echo "Bring up DCAE platform components" + /opt/docker/docker-compose -f docker-compose-3.yaml up -d + + if [ "$DEPLOYMENT_PROFILE" == "R2PLUS" ]; then + echo "Bring up additional (plus) DCAE service components" + /opt/docker/docker-compose -f docker-compose-4.yaml up -d + fi + fi + + # start proxy for consul's health check + CONSULIP=$(cat /opt/config/dcae_ip_addr.txt) + echo "Consul is available at $CONSULIP" fi +cat >./nginx.conf <<EOL +server { + listen 80; + server_name dcae.simpledemo.onap.org; + root /www/healthcheck; + + location /healthcheck { + try_files /services.yaml =404; + } + location /R1 { + proxy_pass http://${CONSULIP}:8500/v1/health/state/passing; + } + location /R2MIN{ + try_files /r2mvp_healthy.yaml =404; + } + location /R2 { + try_files /r2_healthy.yaml =404; + } + location /R2PLUS { + try_files /r2plus_healthy.yaml =404; + } +} +EOL + +HEALTHPORT=8000 +docker run -d \ +--name dcae-health \ +-p ${HEALTHPORT}:80 \ +-v "$(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf" \ +-v "/tmp/healthcheck:/www/healthcheck" \ + nginx + +echo "Healthcheck API available at http://${MYFLOATIP}:${HEALTHPORT}/healthcheck" +echo " http://${MYFLOATIP}:${HEALTHPORT}/R1" +echo " http://${MYFLOATIP}:${HEALTHPORT}/R2MIN" +echo " http://${MYFLOATIP}:${HEALTHPORT}/R2PLUS" + +# run forever for updating health status based on consul +while : +do + rm -rf /tmp/healthcheck/* + # all registered services + SERVICES=$(curl -s http://consul:8500/v1/agent/services |jq '. | to_entries[] | .value.Service') + # passing services + SERVICES=$(curl -s http://consul:8500/v1/health/state/passing | jq '.[] | .ServiceName') + + # remove empty lines/entries + SERVICES=$(echo "$SERVICES" | sed '/^\s*\"\"\s*$/d' |sed '/^\s*$/d') + + SERVICES_JSON=$(echo "$SERVICES" | sed 's/\"$/\",/g' | sed '$ s/.$//') + + + PLT_CONSUL=$(echo "$SERVICES" |grep consul) + PLT_CBS=$(echo "$SERVICES" |grep "config_binding_service") + MVP_PG_HOLMES=$(echo "$SERVICES" |grep "pgHolmes") + MVP_VES=$(echo "$SERVICES" |grep "mvp.*ves") + MVP_TCA=$(echo "$SERVICES" |grep "mvp.*tca") + MVP_HR=$(echo "$SERVICES" |grep "mvp.*holmes-rule") + MVP_HE=$(echo "$SERVICES" |grep "mvp.*holmes-engine") + + PLT_CM=$(echo "$SERVICES" |grep "cloudify.*manager") + PLT_DH=$(echo "$SERVICES" |grep "deployment.*handler") + PLT_PH=$(echo "$SERVICES" |grep "policy.*handler") + PLT_SCH=$(echo "$SERVICES" |grep "service.*change.*handler") + PLT_INV=$(echo "$SERVICES" |grep "inventory") + PLT_PG_INVENTORY=$(echo "$SERVICES" |grep "pgInventory") + + PLUS_MHB=$(echo "$SERVICES" |grep "heartbeat") + PLUS_PRH=$(echo "$SERVICES" |grep "prh") + PLUS_MPR=$(echo "$SERVICES" |grep "mapper") + PLUS_TRAP=$(echo "$SERVICES" |grep "snmptrap") + + DATA="{\"healthy\" : \"$(date)\", \"healthy_services\": [${SERVICES_JSON}]}" + if [[ -n $PLT_CONSUL && -n $PLT_CBS && -n $MVP_PG_HOLMES && -n $MVP_VES && \ + -n $MVP_TCA && -n $MVP_HR && -n $MVP_HE ]]; then + echo "${DATA}" > /tmp/healthcheck/r2mvp_healthy.yaml + echo "${DATA}" > /tmp/healthcheck/services.yaml + fi + + if [[ -n $CONSUL && -n $CBS && -n $PLT_CM && -n $PLT_DH && \ + -n $PLT_PH && -n $PLT_SCH && -n $PLT_INV && -n $PLT_PG_INVENTORY ]]; then + echo "${DATA}" > /tmp/healthcheck/r2_healthy.yaml + + if [[ -n $PLUS_MHB && -n $PLUS_PRH && -n $PLUS_MPR && -n $PLUS_TRAP ]]; then + echo "${DATA}" > /tmp/healthcheck/r2plus_healthy.yaml + fi + fi + + sleep 60 +done + diff --git a/boot/vfc_vm_init.sh b/boot/vfc_vm_init.sh index 63e8b54e..288404b7 100755 --- a/boot/vfc_vm_init.sh +++ b/boot/vfc_vm_init.sh @@ -50,19 +50,19 @@ docker rm -f vfc_svnfm_nokiav2 docker run -i -t -d --name vfc_wfengine_activiti -p 8804:8080 -e SERVICE_IP=$OPENO_IP -e SERVICE_PORT=8804 -e OPENPALETTE_MSB_IP=$OPENO_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-activiti:$ACTIVITI_DOCKER_VER docker run -i -t -d --name vfc_wfengine_mgrservice -p 8805:10550 -e SERVICE_IP=$OPENO_IP -e SERVICE_PORT=8805 -e OPENPALETTE_MSB_IP=$OPENO_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-mgrservice:$MGRSERVICE_DOCKER_VER docker run -i -t -d --name vfc_catalog -p 8806:8806 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/catalog:$CATALOG_DOCKER_VER -docker run -i -t -d --name vfc_emsdriver -p 8206:8206 -e MSB_ADDR=$OPENO_IP:80 -e VES_ADDR=$DCAE_COLL_IP:8080 -e VES_AUTHINFO="":"" $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$EMSDRIVER_DOCKER_VER -docker run -i -t -d --name vfc_gvnfmdriver -p 8484:8484 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$GVNFMDRIVER_DOCKER_VER -docker run -i -t -d --name vfc_jujudriver -p 8483:8483 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/jujudriver:$JUJUDRIVER_DOCKER_VER -docker run -i -t -d --name vfc_svnfm_huawei -p 8482:8482 -p 8443:8443 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/huawei:$HUAWEI_DOCKER_VER -docker run -i -t -d --name vfc_nslcm -p 8403:8403 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nslcm:$NSLCM_DOCKER_VER -docker run -i -t -d --name vfc_resmanagement -p 8480:8480 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/resmanagement:$RESMANAGEMENT_DOCKER_VER -docker run -i -t -d --name vfc_vnflcm -p 8801:8801 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$VNFLCM_DOCKER_VER -docker run -i -t -d --name vfc_vnfmgr -p 8803:8803 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$VNFMGR_DOCKER_VER -docker run -i -t -d --name vfc_vnfres -p 8802:8802 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$VNFRES_DOCKER_VER -docker run -i -t -d --name vfc_ztesdncdriver -p 8411:8411 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$ZTESDNCDRIVER_DOCKER_VER -docker run -i -t -d --name vfc_ztevnfmdriver -p 8410:8410 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztevnfmdriver:$ZTEVNFMDRIVER_DOCKER_VER -docker run -i -t -d --name vfc_svnfm_nokia -p 8486:8486 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER -docker run -i -t -d --name vfc_multivimproxy -p 8481:8481 -e MSB_ADDR=$MSB_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/multivimproxy:$MULTIVIMPROXY_DOCKER_VER +docker run -i -t -d --name vfc_emsdriver -p 8206:8206 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP -e VES_ADDR=$DCAE_COLL_IP:8080 -e VES_AUTHINFO="":"" $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$EMSDRIVER_DOCKER_VER +docker run -i -t -d --name vfc_gvnfmdriver -p 8484:8484 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$GVNFMDRIVER_DOCKER_VER +docker run -i -t -d --name vfc_jujudriver -p 8483:8483 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/jujudriver:$JUJUDRIVER_DOCKER_VER +docker run -i -t -d --name vfc_svnfm_huawei -p 8482:8482 -p 8443:8443 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/huawei:$HUAWEI_DOCKER_VER +docker run -i -t -d --name vfc_nslcm -p 8403:8403 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/nslcm:$NSLCM_DOCKER_VER +docker run -i -t -d --name vfc_resmanagement -p 8480:8480 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/resmanagement:$RESMANAGEMENT_DOCKER_VER +docker run -i -t -d --name vfc_vnflcm -p 8801:8801 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$VNFLCM_DOCKER_VER +docker run -i -t -d --name vfc_vnfmgr -p 8803:8803 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$VNFMGR_DOCKER_VER +docker run -i -t -d --name vfc_vnfres -p 8802:8802 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$VNFRES_DOCKER_VER +docker run -i -t -d --name vfc_ztesdncdriver -p 8411:8411 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$ZTESDNCDRIVER_DOCKER_VER +docker run -i -t -d --name vfc_ztevnfmdriver -p 8410:8410 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/ztevnfmdriver:$ZTEVNFMDRIVER_DOCKER_VER +docker run -i -t -d --name vfc_svnfm_nokia -p 8486:8486 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER +docker run -i -t -d --name vfc_multivimproxy -p 8481:8481 -e MSB_ADDR=$MSB_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/multivimproxy:$MULTIVIMPROXY_DOCKER_VER CBAM_IP=$(cat /opt/config/cbam_ip.txt) VNFM_ID=vnfmUuid diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 00bdeeec..329b677c 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -139,7 +139,6 @@ parameters: aai_sparky_docker: 1.2-STAGING-latest appc_docker: 1.3.0-SNAPSHOT-latest so_docker: 1.2.1 - dcae_docker: v1.1.1 policy_docker: 1.2-STAGING-latest portal_docker: 2.1-STAGING-latest robot_docker: 1.2-STAGING-latest @@ -156,9 +155,28 @@ parameters: cli_docker: v1.1.0 music_docker: latest oof_docker: latest - aaf_docker: latest + aaf_docker: 2.1.0-SNAPSHOT nbi_docker: latest + dcae_docker: 1.1.2 + dcae_snmptrap_docker: latest + dcae_ves_docker: latest + dcae_bootstrap_docker: 1.1.2 + dcae_cm_docker: latest + dcae_k8sbootstrap_docker: latest + dcae_redisc_docker: latest + dcae_tca_docker: latest + dcae_cb_docker: v4.0.0 + dcae_cbs_docker: latest + dcae_dh_docker: latest + dcae_inv_docker: latest + dcae_ph_docker: latest + dcae_sch_docker: latest + dcae_heartbeat_docker: latest + dcae_prh_docker: latest + holmes_rm_docker: v1.0.0 + holmes_em_docker: v1.0.0 + vfc_nokia_docker: 1.1.0-STAGING-latest vfc_nokiav2_docker: 1.1.0-STAGING-latest vfc_ztevnfmdriver_docker: 1.1.0-STAGING-latest diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index eba6d0d5..4445dd38 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -313,8 +313,79 @@ parameters: type: string so_docker: type: string + dcae_docker: type: string + default: latest + dcae_snmptrap_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.collectors.snmptrap + dcae_ves_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.collectors.ves.vescollector + dcae_bootstrap_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.deployments.bootstrap + dcae_cm_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.deployments.cm-container + dcae_k8sbootstrap_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.deployments.k8s-bootstrap-container + dcae_redisc_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.deployments.redis-cluster-container + dcae_tca_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.deployments.tca-cdap-container + dcae_cb_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.platform.cdapbroker + dcae_cbs_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.platform.configbinding + dcae_dh_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.platform.deployment-handler + dcae_inv_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.platform.inventory-api + dcae_ph_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.platform.deployment-handler + dcae_sch_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.platform.servicechange-handler + dcae_heartbeat_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.services.heartbeat + dcae_prh_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.services.prh.prh-app-server + holmes_em_docker: + type: string + default: latest + description: Docker image version for onap/holmes/engine-management + holmes_rm_docker: + type: string + default: latest + description: Docker image version for onap/holmes/rule-management + policy_docker: type: string portal_docker: @@ -1697,7 +1768,7 @@ resources: flavor: { get_param: flavor_large } name: str_replace: - template: base-dcae-bootstrap + template: base-dcae params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } @@ -1773,6 +1844,26 @@ resources: __policy_floating_ip_addr__: { get_attr: [policy_floating_ip, floating_ip_address] } __openo_floating_ip_addr__: { get_attr: [openo_floating_ip, floating_ip_address] } __dcae_c_floating_ip_addr__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } + # container versions + __dcae_docker__: { get_param: dcae_docker } + __dcae_snmptrap_docker__: { get_param: dcae_snmptrap_docker } + __dcae_ves_docker__: { get_param: dcae_ves_docker } + __dcae_bootstrap_docker__: { get_param: dcae_bootstrap_docker } + __dcae_cm_docker__: { get_param: dcae_cm_docker } + __dcae_k8sbootstrap_docker__: { get_param: dcae_k8sbootstrap_docker } + __dcae_redisc_docker__: { get_param: dcae_redisc_docker } + __dcae_tca_docker__: { get_param: dcae_tca_docker } + __dcae_cb_docker__: { get_param: dcae_cb_docker } + __dcae_cbs_docker__: { get_param: dcae_cbs_docker } + __dcae_dh_docker__: { get_param: dcae_dh_docker } + __dcae_inv_docker__: { get_param: dcae_inv_docker } + __dcae_ph_docker__: { get_param: dcae_ph_docker } + __dcae_sch_docker__: { get_param: dcae_sch_docker } + __dcae_heartbeat_docker__: { get_param: dcae_heartbeat_docker } + __dcae_prh_docker__: { get_param: dcaeprh_docker } + __holmes_em_docker__: { get_param: holmes_em_docker } + __holmes_rm_docker__: { get_param: holmes_rm_docker } + template: | #!/bin/bash @@ -1841,6 +1932,25 @@ resources: echo "__policy_floating_ip_addr__" > /opt/config/policy_floating_ip_addr.txt echo "__openo_floating_ip_addr__" > /opt/config/openo_floating_ip_addr.txt echo "__dcae_c_floating_ip_addr__" > /opt/config/dcae_c_floating_ip_addr.txt + # container versions + echo "__dcae_docker__" > /opt/config/dcae_docker.txt + echo "__dcae_snmptrap_docker__" > /opt/config/dcae_docker_snmptrap.txt + echo "__dcae_ves_docker__" > /opt/config/dcae_docker_ves.txt + echo "__dcae_bootstrap_docker__" > /opt/config/dcae_docker_bootstrap.txt + echo "__dcae_cm_docker__" > /opt/config/dcae_docker_cm.txt + echo "__dcae_k8sbootstrap_docker__" > /opt/config/dcae_docker_k8sbootstrap.txt + echo "__dcae_redisc_docker__" > /opt/config/dcae_docker_redisc.txt + echo "__dcae_tca_docker__" > /opt/config/dcae_docker_tca.txt + echo "__dcae_cb_docker__" > /opt/config/dcae_docker_cb.txt + echo "__dcae_cbs_docker__" > /opt/config/dcae_docker_cbs.txt + echo "__dcae_dh_docker__" > /opt/config/dcae_docker_dh.txt + echo "__dcae_inv_docker__" > /opt/config/dcae_docker_inv.txt + echo "__dcae_ph_docker__" > /opt/config/dcae_docker_ph.txt + echo "__dcae_sch_docker__" > /opt/config/dcae_docker_sch.txt + echo "__dcae_heartbeat_docker__" > /opt/config/dcae_docker_heartbeat.txt + echo "__dcae_prh_docker__" > /opt/config/dcae_docker_prh.txt + echo "__holmes_em_docker__" > /opt/config/holmes_docker_em.txt + echo "__holmes_rm_docker__" > /opt/config/holmes_docker_rm.txt # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh @@ -2020,6 +2130,8 @@ resources: __docker_version__: { get_param: aaf_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __aaf_repo__: { get_param: aaf_repo } + __gerrit_branch__: { get_param: aaf_branch } template: | #!/bin/bash @@ -2034,6 +2146,8 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt + echo "__aaf_repo__" > /opt/config/remote_repo.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aaf_install.sh -o /opt/aaf_install.sh diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml index 19819566..17266b25 100644 --- a/heat/ONAP/onap_openstack_light.yaml +++ b/heat/ONAP/onap_openstack_light.yaml @@ -2008,6 +2008,8 @@ resources: __docker_version__: { get_param: aaf_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __aaf_repo__: { get_param: aaf_repo } + __gerrit_branch__: { get_param: aaf_branch } template: | #!/bin/bash @@ -2022,6 +2024,8 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt + echo "__aaf_repo__" > /opt/config/remote_repo.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aaf_install.sh -o /opt/aaf_install.sh diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index fbabf097..475efd7c 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -133,12 +133,12 @@ parameters: clamp_branch: master vnfsdk_branch: master music_branch: master + aaf_branch: master aai_docker: ${AAI_RESOURCES_DOCKER} aai_sparky_docker: ${AAI_RESOURCES_DOCKER} appc_docker: ${APPC_IMAGE_DOCKER} so_docker: ${MSO_DOCKER} - dcae_docker: ${BOOTSTRAP_DOCKER} policy_docker: ${POLICY_DB_DOCKER} portal_docker: ${PORTAL_APP_DOCKER} robot_docker: ${TESTSUITE_DOCKER} @@ -158,6 +158,25 @@ parameters: aaf_docker: ${AAF_DOCKER} nbi_docker: ${NBI_DOCKER} + dcae_docker: ${BOOTSTRAP_DOCKER} + dcae_snmptrap_docker: ${SNMPTRAP_DOCKER} + dcae_ves_docker: ${VESCOLLECTOR_DOCKER} + dcae_bootstrap_docker: ${BOOTSTRAP_DOCKER} + dcae_cm_docker: ${CM_CONTAINER_DOCKER} + dcae_k8sbootstrap_docker: ${K8S_BOOTSTRAP_CONTAINER_DOCKER} + dcae_redisc_docker: ${REDIS_CLUSTER_CONTAINER_DOCKER} + dcae_tca_docker: ${TCA_CDAP_CONTAINER_DOCKER} + dcae_cb_docker: ${CDAPBROKER_DOCKER} + dcae_cbs_docker: ${CONFIGBINDING_DOCKER} + dcae_dh_docker: ${DEPLOYMENT_HANDLER_DOCKER} + dcae_inv_docker: ${INVENTORY_API_DOCKER} + dcae_ph_docker: ${POLICY_HANDLER_DOCKER} + dcae_sch_docker: ${SERVICECHANGE_HANDLER_DOCKER} + dcae_heartbeat_docker: ${HEARTBEAT_DOCKER} + dcae_prh_docker: ${PRH_APP_SERVER_DOCKER} + holmes_rm_docker: ${RULE_MANAGEMENT_DOCKER} + holmes_em_docker: ${ENGINE_MANAGEMENT_DOCKER} + vfc_nokia_docker: ${NOKIA_DOCKER} vfc_nokiav2_docker: ${NOKIAV2_DOCKER} vfc_ztevnfmdriver_docker: ${ZTEVNFMDRIVER_DOCKER} @@ -204,3 +223,4 @@ parameters: clamp_repo: http://gerrit.onap.org/r/clamp.git vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git music_repo: http://gerrit.onap.org/r/music.git + aaf_repo: http://gerrit.onap.org/r/aaf/authz.git
\ No newline at end of file |