X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FOpenECOMP%2Fopenecomp_rackspace.yaml;h=0a1733c6c8b25783c31ba0bb57375b920d89bd4f;hb=7ef0227da17c5f72452d537c4c4b42a6b868a005;hp=4e75bde02fc9cc45b4f840d24358e74959e584e4;hpb=c82c2a1626a5d5e2da2bc0a0093a949cf65e8af6;p=demo.git diff --git a/heat/OpenECOMP/openecomp_rackspace.yaml b/heat/OpenECOMP/openecomp_rackspace.yaml index 4e75bde0..0a1733c6 100644 --- a/heat/OpenECOMP/openecomp_rackspace.yaml +++ b/heat/OpenECOMP/openecomp_rackspace.yaml @@ -1,10 +1,10 @@ heat_template_version: 2013-05-23 -description: Heat template to deploy OpenECOMP components +description: Heat template to deploy ONAP components parameters: - # Generic parameters used across all OpenECOMP components + # Generic parameters used across all ONAP components public_net_id: type: string label: Public network name or ID @@ -58,8 +58,17 @@ parameters: artifacts_version: type: string label: Artifacts Version - description: Artifacts version of OpenECOMP components + description: Artifacts version of ONAP components + + docker_version: + type: string + label: Docker Version + description: Docker version of ONAP docker images + gerrit_branch: + type: string + label: Gerrit code branch + description: Gerrit branch where to download the code from # Parameters for DCAE instantiation dcae_zone: @@ -119,7 +128,7 @@ resources: properties: length: 4 - # Public key used to access OpenECOMP components + # Public key used to access ONAP components vm_key: type: OS::Nova::KeyPair properties: @@ -133,7 +142,7 @@ resources: save_private_key: false - # OpenECOMP management private network + # ONAP management private network oam_ecomp: type: OS::Neutron::Net properties: @@ -153,7 +162,7 @@ resources: rand: { get_resource: random-str } network_id: { get_resource: oam_ecomp } cidr: 10.0.0.0/8 - value: { get_attr: [oam_ecomp, name] } + #value: { get_attr: [oam_ecomp, name] } # DNS Server instantiation @@ -240,6 +249,7 @@ resources: __gitlab_password__: { get_param: gitlab_password } __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } + __docker_version__: { get_param: docker_version } template: | #!/bin/bash @@ -283,6 +293,7 @@ resources: echo "__gitlab_username__" > /opt/config/gitlab_username.txt echo "__gitlab_password__" > /opt/config/gitlab_password.txt echo "gerrit.openecomp.org" > /opt/config/gitlab_certname.txt + echo "__docker_version__" > /opt/config/docker_version.txt # Execute docker instructions cd /opt @@ -321,6 +332,8 @@ resources: __openstack_api_key__: { get_param: openstack_api_key } __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } + __docker_version__: { get_param: docker_version } + __gerrit_branch__: { get_param: gerrit_branch } template: | #!/bin/bash @@ -363,11 +376,11 @@ resources: echo "__openstack_username__" > /opt/config/openstack_username.txt echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt - + echo "__docker_version__" > /opt/config/docker_version.txt # Run docker-compose to spin up containers cd /opt - git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/mso/docker-config.git test_lab + git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/mso/docker-config.git test_lab MSO_ENCRYPTION_KEY=$(cat /opt/test_lab/encryption.key) echo -n "__openstack_api_key__" | openssl aes-128-ecb -e -K $MSO_ENCRYPTION_KEY -nosalt | xxd -c 256 -p > /opt/config/api_key.txt ./mso_vm_init.sh @@ -401,6 +414,7 @@ resources: __gitlab_username__: { get_param: gitlab_username } __gitlab_password__: { get_param: gitlab_password } __artifacts_version__: { get_param: artifacts_version } + __gerrit_branch__: { get_param: gerrit_branch } template: | #!/bin/bash @@ -443,7 +457,7 @@ resources: # Run docker-compose to spin up containers cd /opt - git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/message-router.git dcae-startup-vm-message-router + git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/message-router.git dcae-startup-vm-message-router ./mr_vm_init.sh @@ -480,6 +494,8 @@ resources: __openstack_password__: { get_param: openstack_password } __artifacts_version__: { get_param: artifacts_version } __openstack_region__: { get_param: openstack_region } + __docker_version__: { get_param: docker_version } + __gerrit_branch__: { get_param: gerrit_branch } template: | #!/bin/bash @@ -491,6 +507,7 @@ resources: add-apt-repository -y ppa:openjdk-r/ppa apt-get update apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk ntp ntpdate + echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic # Download scripts from Nexus curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/robot_vm_init.sh -o /opt/robot_vm_init.sh @@ -506,7 +523,6 @@ resources: apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y docker-engine - #sed -i 's|^ExecStart=/usr/bin/dockerd \s*-H \s*fd://\s*$|ExecStart=/usr/bin/dockerd -H fd:// -H tcp://0.0.0.0:2375|' /lib/systemd/system/docker.service service docker start mkdir /opt/docker @@ -527,6 +543,7 @@ resources: echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt echo "__openstack_region__" > /opt/config/region.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__docker_version__" > /opt/config/docker_version.txt # Execute RobotETE-specific instructions: create share folder to run as a docker volume mkdir -p /opt/eteshare/logs @@ -534,7 +551,7 @@ resources: # Run docker-compose to spin up containers cd /opt - git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/testsuite/properties.git testsuite/properties + git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/testsuite/properties.git testsuite/properties ./robot_vm_init.sh @@ -566,6 +583,8 @@ resources: __gitlab_username__: { get_param: gitlab_username } __gitlab_password__: { get_param: gitlab_password } __artifacts_version__: { get_param: artifacts_version } + __docker_version__: { get_param: docker_version } + __gerrit_branch__: { get_param: gerrit_branch } template: | #!/bin/bash @@ -605,10 +624,11 @@ resources: echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__gitlab_username__" > /opt/config/gitlab_username.txt echo "__gitlab_password__" > /opt/config/gitlab_password.txt + echo "__docker_version__" > /opt/config/docker_version.txt # Run script to spin up containers cd /opt - git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/vid.git + git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/vid.git ./vid_vm_init.sh @@ -640,6 +660,8 @@ resources: __gitlab_username__: { get_param: gitlab_username } __gitlab_password__: { get_param: gitlab_password } __artifacts_version__: { get_param: artifacts_version } + __docker_version__: { get_param: docker_version } + __gerrit_branch__: { get_param: gerrit_branch } template: | #!/bin/bash @@ -681,10 +703,11 @@ resources: echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__gitlab_username__" > /opt/config/gitlab_username.txt echo "__gitlab_password__" > /opt/config/gitlab_password.txt + echo "__docker_version__" > /opt/config/docker_version.txt # Run docker-compose to spin up containers cd /opt - git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/sdnc/oam.git sdnc + git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/sdnc/oam.git sdnc ./sdnc_vm_init.sh @@ -741,8 +764,11 @@ resources: __gitlab_password__: { get_param: gitlab_password } __env_name__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } + __docker_version__: { get_param: docker_version } + __gerrit_branch__: { get_param: gerrit_branch } template: | #!/bin/bash + # DNS/GW IP address configuration mkdir /opt/config echo "10.0.0.1" > /opt/config/dns_gw_ip.txt @@ -789,6 +815,8 @@ resources: echo "__gitlab_username__" > /opt/config/gitlab_username.txt echo "__gitlab_password__" > /opt/config/gitlab_password.txt echo "__env_name__" > /opt/config/env_name.txt + echo "10.0.11.1" > /opt/config/mr_ip_addr.txt + echo "__docker_version__" > /opt/config/docker_version.txt # Run SDC-specific instructions cd /opt @@ -800,7 +828,7 @@ resources: chmod 777 /data/logs/BE chmod 777 /data/logs/FE - git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/sdc.git + git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/sdc.git cat > /root/.bash_aliases << EOF alias dcls='/data/scripts/docker_clean.sh \$1' @@ -851,8 +879,11 @@ resources: __gitlab_username__: { get_param: gitlab_username } __gitlab_password__: { get_param: gitlab_password } __artifacts_version__: { get_param: artifacts_version } + __docker_version__: { get_param: docker_version } + __gerrit_branch__: { get_param: gerrit_branch } template: | #!/bin/bash + # DNS/GW IP address configuration mkdir /opt/config echo "10.0.0.1" > /opt/config/dns_gw_ip.txt @@ -890,11 +921,12 @@ resources: echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__gitlab_username__" > /opt/config/gitlab_username.txt echo "__gitlab_password__" > /opt/config/gitlab_password.txt + echo "__docker_version__" > /opt/config/docker_version.txt # Run Portal-specific instructions mkdir -p /PROJECT/OpenSource/UbuntuEP/logs cd /opt - git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/portal.git + git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/portal.git # Run docker-compose to spin up containers ./portal_vm_init.sh @@ -940,8 +972,11 @@ resources: __pub_key__: { get_param: pub_key } __nexus_repo_root__: { get_param: nexus_repo_root } __openstack_region__: { get_param: openstack_region } + __docker_version__: { get_param: docker_version } + __gerrit_branch__: { get_param: gerrit_branch } template: | #!/bin/bash + # DNS/GW IP address configuration echo "nameserver 10.0.0.1" >> /etc/resolvconf/resolv.conf.d/head resolvconf -u @@ -972,14 +1007,14 @@ resources: # DCAE Controller specific deployment cd /opt - git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/controller.git dcae-startup-vm-controller + git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/controller.git dcae-startup-vm-controller cd dcae-startup-vm-controller mkdir -p /opt/app/dcae-controller cat > /opt/app/dcae-controller/config.yaml << EOF_CONFIG ZONE: __dcae_zone__ STATE: __dcae_state__ - DCAE-VERSION: 0.1.0-SNAPSHOT + DCAE-VERSION: __artifacts_version__ HORIZON-URL: https://mycloud.rackspace.com/cloud/__tenant_id__ KEYSTONE-URL: https://identity.api.rackspacecloud.com/v2.0 OPENSTACK-TENANT-ID: __tenant_id__ @@ -1010,6 +1045,7 @@ resources: echo "__gitlab_username__" > /opt/config/gitlab_username.txt echo "__gitlab_password__" > /opt/config/gitlab_password.txt echo "__gitlab_branch__" > /opt/config/gitlab_branch.txt + echo "__docker_version__" > /opt/config/docker_version.txt cd /opt ./dcae_vm_init.sh @@ -1053,8 +1089,11 @@ resources: __gitlab_username__: { get_param: gitlab_username } __gitlab_password__: { get_param: gitlab_password } __artifacts_version__: { get_param: artifacts_version } + __docker_version__: { get_param: docker_version } + __gerrit_branch__: { get_param: gerrit_branch } template: | #!/bin/bash + # DNS/GW IP address configuration mkdir /opt/config echo "10.0.0.1" > /opt/config/dns_gw_ip.txt @@ -1092,10 +1131,11 @@ resources: echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__gitlab_username__" > /opt/config/gitlab_username.txt echo "__gitlab_password__" > /opt/config/gitlab_password.txt + echo "__docker_version__" > /opt/config/docker_version.txt # Run docker-compose to spin up containers cd /opt - git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/policy/docker.git policy + git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/policy/docker.git policy ./policy_vm_init.sh @@ -1129,6 +1169,8 @@ resources: __gitlab_password__: { get_param: gitlab_password } __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } + __docker_version__: { get_param: docker_version } + __gerrit_branch__: { get_param: gerrit_branch } template: | #!/bin/bash @@ -1171,9 +1213,10 @@ resources: echo "__gitlab_username__" > /opt/config/gitlab_username.txt echo "__gitlab_password__" > /opt/config/gitlab_password.txt echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt + echo "__docker_version__" > /opt/config/docker_version.txt # Run docker-compose to spin up containers cd /opt - git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/appc/deployment.git appc + git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/appc/deployment.git appc ./appc_vm_init.sh