diff options
Diffstat (limited to 'heat')
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 66 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 835 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_float.env | 72 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_float.yaml | 888 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_nofloat.env | 69 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_nofloat.yaml | 786 | ||||
| -rw-r--r-- | heat/ONAP/onap_rackspace.env | 45 | ||||
| -rw-r--r-- | heat/ONAP/onap_rackspace.yaml | 242 | ||||
| -rw-r--r-- | heat/vCPE/infra/MANIFEST.json | 4 | ||||
| -rw-r--r-- | heat/vCPE/infra/base_vcpe_infra.env (renamed from heat/vCPE/infra/base_vcpe_infra_rackspace.env) | 17 | ||||
| -rw-r--r-- | heat/vCPE/infra/base_vcpe_infra.yaml (renamed from heat/vCPE/infra/base_vcpe_infra_rackspace.yaml) | 64 | ||||
| -rw-r--r-- | heat/vCPE/vbng/MANIFEST.json | 4 | ||||
| -rw-r--r-- | heat/vCPE/vbng/base_vcpe_vbng.env (renamed from heat/vCPE/vbng/base_vcpe_vbng_rackspace.env) | 20 | ||||
| -rw-r--r-- | heat/vCPE/vbng/base_vcpe_vbng.yaml (renamed from heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml) | 51 | ||||
| -rw-r--r-- | heat/vCPE/vbrgemu/MANIFEST.json | 4 | ||||
| -rw-r--r-- | heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env (renamed from heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env) | 23 | ||||
| -rw-r--r-- | heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml (renamed from heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml) | 44 | ||||
| -rw-r--r-- | heat/vCPE/vgmux/MANIFEST.json | 4 | ||||
| -rw-r--r-- | heat/vCPE/vgmux/base_vcpe_vgmux.env (renamed from heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env) | 24 | ||||
| -rw-r--r-- | heat/vCPE/vgmux/base_vcpe_vgmux.yaml (renamed from heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml) | 80 | ||||
| -rw-r--r-- | heat/vCPE/vgw/MANIFEST.json | 4 | ||||
| -rw-r--r-- | heat/vCPE/vgw/base_vcpe_vgw.env (renamed from heat/vCPE/vgw/base_vcpe_vgw_rackspace.env) | 22 | ||||
| -rw-r--r-- | heat/vCPE/vgw/base_vcpe_vgw.yaml (renamed from heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml) | 40 | ||||
| -rw-r--r-- | heat/vFW/.DS_Store | bin | 6148 -> 0 bytes | |||
| -rw-r--r-- | heat/vFW/base_vfw.env (renamed from heat/vFW/base_vfw_openstack.env) | 2 | ||||
| -rw-r--r-- | heat/vFW/base_vfw.yaml (renamed from heat/vFW/base_vfw_openstack.yaml) | 5 | ||||
| -rw-r--r-- | heat/vFW/base_vfw_rackspace.env | 32 | ||||
| -rw-r--r-- | heat/vFW/base_vfw_rackspace.yaml | 377 |
28 files changed, 2410 insertions, 1414 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 4b13a466..189dfd27 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -12,6 +12,8 @@ parameters: ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE + centos_7_image: PUT THE CENTOS 7 IMAGE NAME HERE + flavor_small: PUT THE SMALL FLAVOR NAME HERE flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE @@ -20,12 +22,20 @@ parameters: flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE + flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE + + security_group: PUT THE NAME OF THE SECURITY GROUP HERE + vm_base_name: vm1 key_name: onap_key + dcae_key_name: dcae_key + pub_key: PUT YOUR PUBLIC KEY HERE + dcae_pub_key: PUT YOUR DCAE PUBLIC KEY HERE + nexus_repo: https://nexus.onap.org/content/sites/raw nexus_docker_repo: nexus3.onap.org:10001 @@ -38,10 +48,6 @@ parameters: artifacts_version: 1.1.0-SNAPSHOT - docker_version: 1.1-STAGING-latest - - gerrit_branch: master - openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE openstack_username: PUT YOUR OPENSTACK USERNAME HERE @@ -54,7 +60,7 @@ parameters: horizon_url: PUT THE HORIZON URL HERE - keystone_url: PUT THE KEYSTONE URL HERE + keystone_url: PUT THE KEYSTONE URL HERE (do not include version number) cloud_env: openstack @@ -67,10 +73,10 @@ parameters: dns_list: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems) external_dns: PUT THE FIRST ADDRESS OF THE EXTERNAL DNS LIST HERE + oam_network_cidr: 10.0.0.0/16 ### Private IP addresses ### - oam_network_cidr: 10.0.0.0/16 aai1_ip_addr: 10.0.1.1 aai2_ip_addr: 10.0.1.2 appc_ip_addr: 10.0.2.1 @@ -81,7 +87,7 @@ parameters: dcae_hdp2_ip_addr: 10.0.4.104 dcae_hdp3_ip_addr: 10.0.4.105 dns_ip_addr: 10.0.100.1 - mso_ip_addr: 10.0.5.1 + so_ip_addr: 10.0.5.1 mr_ip_addr: 10.0.11.1 policy_ip_addr: 10.0.6.1 portal_ip_addr: 10.0.9.1 @@ -89,6 +95,8 @@ parameters: sdc_ip_addr: 10.0.3.1 sdnc_ip_addr: 10.0.7.1 vid_ip_addr: 10.0.8.1 + clamp_ip_addr: 10.0.12.1 + openo_ip_addr: 10.0.14.1 dcae_coll_float_ip: PUT DCAE COLLECTOR FLOATING IP HERE dcae_db_float_ip: PUT DCAE DATABASE FLOATING IP HERE @@ -117,6 +125,46 @@ parameters: dcae_code_version: 1.1.0 + ################################ + # # + # Docker versions and branches # + # # + ################################ + + aai_branch: master + appc_branch: master + so_branch: master + mr_branch: master + dcae_branch: master + policy_branch: master + portal_branch: master + robot_branch: master + sdc_branch: master + sdnc_branch: master + vid_branch: master + clamp_branch: master + vnfsdk_branch: master + + aai_docker: 1.1-STAGING-latest + appc_docker: 1.1-STAGING-latest + so_docker: 1.1-STAGING-latest + mr_docker: 1.1-STAGING-latest + dcae_docker: 1.1-latest + policy_docker: 1.1-STAGING-latest + portal_docker: 1.3-STAGING-latest + robot_docker: 1.1-STAGING-latest + sdc_docker: 1.1-STAGING-latest + sdnc_docker: 1.2-STAGING-latest + vid_docker: 1.1-STAGING-latest + clamp_docker: 1.1-STAGING-latest + msb_docker: latest + mvim_docker: latest + vfc_docker: latest + uui_docker: latest + esr_docker: latest + dgbuilder_docker: 0.1-STAGING-latest + cli_docker: 1.1-STAGING-latest + ##################### # # # ONAP repositories # @@ -126,10 +174,12 @@ parameters: appc_repo: http://gerrit.onap.org/r/appc/deployment.git dcae_repo: http://gerrit.onap.org/r/dcae/demo/startup/controller.git mr_repo: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git - mso_repo: http://gerrit.onap.org/r/so/docker-config.git + so_repo: http://gerrit.onap.org/r/so/docker-config.git policy_repo: http://gerrit.onap.org/r/policy/docker.git portal_repo: http://gerrit.onap.org/r/portal.git robot_repo: http://gerrit.onap.org/r/testsuite/properties.git sdc_repo: http://gerrit.onap.org/r/sdc.git sdnc_repo: http://gerrit.onap.org/r/sdnc/oam.git vid_repo: http://gerrit.onap.org/r/vid.git + clamp_repo: http://gerrit.onap.org/r/clamp.git + vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 10396c26..e8e44a0c 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -52,6 +52,10 @@ parameters: type: string description: Name of the Ubuntu 16.04 image + centos_7_image: + type: string + description: Name of the CentOS 7 image + flavor_small: type: string description: Name of the Small Flavor supported by the cloud provider @@ -68,6 +72,14 @@ parameters: type: string description: Name of the Extra Large Flavor supported by the cloud provider + flavor_xxlarge: + type: string + description: Name of the Extra Extra Large Flavor supported by the cloud provider + + security_group: + type: string + description: Security group used by DCAE GEN 2 + vm_base_name: type: string description: Base name of ONAP VMs @@ -76,10 +88,18 @@ parameters: type: string description: Public/Private key pair name + dcae_key_name: + type: string + description: Public/Private key pair name for DCAE GEN 2 + pub_key: type: string description: Public key to be installed on the compute instance + dcae_pub_key: + type: string + description: Public key to be installed on the DCAE GEN 2 compute instance + nexus_repo: type: string description: Complete URL for the Nexus repository. @@ -100,15 +120,6 @@ parameters: type: string description: Artifacts version of ONAP components - docker_version: - type: string - label: Version number of ONAP docker images - - gerrit_branch: - type: string - label: Gerrit code branch - description: Gerrit branch where to download the code from - dmaap_topic: type: string description: DMaaP Topic name @@ -127,7 +138,7 @@ parameters: openstack_api_key: type: string - description: Openstack API Key + description: Openstack password or API Key horizon_url: type: string @@ -155,102 +166,61 @@ parameters: type: string description: First element of the dns_list for ONAP network - ### Private IP addresses ### oam_network_cidr: type: string description: CIDR of the OAM ONAP network + ### Private IP addresses ### aai1_ip_addr: type: string - description: AAI Instance 1 IP Address - aai2_ip_addr: type: string - description: AAI Instance 2 IP Address - appc_ip_addr: type: string - description: APP-C IP Address - dcae_ip_addr: type: string - description: DCAE IP Address - dcae_coll_ip_addr: type: string - description: DCAE Collector IP Address - dcae_db_ip_addr: type: string - description: DCAE Database IP Address - dcae_hdp1_ip_addr: type: string - description: Hadoop VM1 IP Address - dcae_hdp2_ip_addr: type: string - description: Hadoop VM2 IP Address - dcae_hdp3_ip_addr: type: string - description: Hadoop VM3 IP Address - dns_ip_addr: type: string - description: DNS IP Address - - mso_ip_addr: + so_ip_addr: type: string - description: MSO IP Address - mr_ip_addr: type: string - description: Message Router IP Address - policy_ip_addr: type: string - description: Policy Engine IP Address - portal_ip_addr: type: string - description: Portal IP Address - robot_ip_addr: type: string - description: Robot Framework IP Address - sdc_ip_addr: type: string - description: SDC IP Address - sdnc_ip_addr: type: string - description: SDN-C IP Address - vid_ip_addr: type: string - description: VID IP Address - + clamp_ip_addr: + type: string + openo_ip_addr: + type: string dcae_coll_float_ip: type: string - description: DCAE Collector Floating IP Address - dcae_db_float_ip: type: string - description: DCAE Collector Database Floating IP Address - dcae_hdp1_float_ip: type: string - description: Hadoop VM1 Floating IP Address - dcae_hdp2_float_ip: type: string - description: Hadoop VM2 Floating IP Address - dcae_hdp3_float_ip: type: string - description: Hadoop VM3 Floating IP Address ########################### # # @@ -298,47 +268,102 @@ parameters: aai_repo: type: string - description: AAI repository - appc_repo: type: string - description: APPC repository - dcae_repo: type: string - description: DCAE repository - mr_repo: type: string - description: Message Router repository - - mso_repo: + so_repo: type: string - description: MSO repository - policy_repo: type: string - description: Policy repository - portal_repo: type: string - description: Portal repository - robot_repo: type: string - description: Robot repository - sdc_repo: type: string - description: SDC repository - sdnc_repo: type: string - description: SDNC repository - vid_repo: type: string - description: VID repository + clamp_repo: + type: string + vnfsdk_repo: + type: string + + ################################ + # # + # Docker versions and branches # + # # + ################################ + + aai_docker: + type: string + appc_docker: + type: string + so_docker: + type: string + mr_docker: + type: string + dcae_docker: + type: string + policy_docker: + type: string + portal_docker: + type: string + robot_docker: + type: string + sdc_docker: + type: string + sdnc_docker: + type: string + vid_docker: + type: string + clamp_docker: + type: string + msb_docker: + type: string + mvim_docker: + type: string + vfc_docker: + type: string + uui_docker: + type: string + esr_docker: + type: string + dgbuilder_docker: + type: string + cli_docker: + type: string + + aai_branch: + type: string + appc_branch: + type: string + so_branch: + type: string + mr_branch: + type: string + dcae_branch: + type: string + policy_branch: + type: string + portal_branch: + type: string + robot_branch: + type: string + sdc_branch: + type: string + sdnc_branch: + type: string + vid_branch: + type: string + clamp_branch: + type: string + vnfsdk_branch: + type: string ############# @@ -367,6 +392,18 @@ resources: public_key: { get_param: pub_key } save_private_key: false + # Public key used to access DCAE GEN 2 + dcae_vm_key: + type: OS::Nova::KeyPair + properties: + name: + str_replace: + template: base_rand + params: + base: { get_param: dcae_key_name } + rand: { get_resource: random-str } + public_key: { get_param: dcae_pub_key } + save_private_key: true # ONAP management private network oam_onap: @@ -442,7 +479,7 @@ resources: __appc_ip_addr__: { get_param: appc_ip_addr } __dcae_ip_addr__: { get_param: dcae_ip_addr } __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } - __mso_ip_addr__: { get_param: mso_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } __portal_ip_addr__: { get_param: portal_ip_addr } @@ -450,6 +487,8 @@ resources: __sdc_ip_addr__: { get_param: sdc_ip_addr } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_ip_addr } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } template: | @@ -467,7 +506,7 @@ resources: echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt - echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt @@ -475,6 +514,8 @@ resources: echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt + echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script @@ -522,8 +563,8 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: aai_docker } + __gerrit_branch__: { get_param: aai_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __aai_repo__: { get_param: aai_repo } @@ -589,8 +630,8 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: aai_docker } + __gerrit_branch__: { get_param: aai_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __aai_repo__: { get_param: aai_repo } @@ -620,32 +661,32 @@ resources: ./aai_install.sh - # MSO instantiation - mso_private_port: + # SO instantiation + so_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } - fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: mso_ip_addr }}] + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: so_ip_addr }}] - mso_floating_ip: + so_floating_ip: type: OS::Neutron::FloatingIP properties: floating_network_id: { get_param: public_net_id } - port_id: { get_resource: mso_private_port } + port_id: { get_resource: so_private_port } - mso_vm: + so_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } flavor: { get_param: flavor_large } name: str_replace: - template: base-mso + template: base-so params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - - port: { get_resource: mso_private_port } + - port: { get_resource: so_private_port } user_data_format: RAW user_data: str_replace: @@ -662,11 +703,11 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: so_docker } + __gerrit_branch__: { get_param: so_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } - __mso_repo__: { get_param: mso_repo } + __so_repo__: { get_param: so_repo } template: | #!/bin/bash @@ -688,13 +729,13 @@ resources: echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt - echo "__mso_repo__" > /opt/config/remote_repo.txt + echo "__so_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mso_install.sh -o /opt/mso_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/so_install.sh -o /opt/so_install.sh cd /opt - chmod +x mso_install.sh - ./mso_install.sh + chmod +x so_install.sh + ./so_install.sh # Message Router instantiation @@ -733,7 +774,7 @@ resources: __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __gerrit_branch__: { get_param: gerrit_branch } + __gerrit_branch__: { get_param: mr_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __mr_repo__: { get_param: mr_repo } @@ -777,7 +818,7 @@ resources: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } - flavor: { get_param: flavor_small } + flavor: { get_param: flavor_medium } name: str_replace: template: base-robot @@ -797,24 +838,27 @@ resources: __network_name__: { get_attr: [oam_onap, name] } __openstack_username__: { get_param: openstack_username } __openstack_api_key__: { get_param : openstack_api_key } + __openstack_tenant_id__: { get_param: openstack_tenant_id } __artifacts_version__: { get_param: artifacts_version } __openstack_region__: { get_param: openstack_region } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: mr_docker } + __gerrit_branch__: { get_param: mr_branch } __cloud_env__: { get_param: cloud_env } __keystone_url__: { get_param: keystone_url } __aai1_ip_addr__: { get_param: aai1_ip_addr } __aai2_ip_addr__: { get_param: aai2_ip_addr } __appc_ip_addr__: { get_param: appc_ip_addr } __dcae_ip_addr__: { get_param: dcae_ip_addr } - __mso_ip_addr__: { get_param: mso_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } __portal_ip_addr__: { get_param: portal_ip_addr } __sdc_ip_addr__: { get_param: sdc_ip_addr } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_ip_addr } __external_dns__: { get_param: external_dns } __vm_image_name__: { get_param: ubuntu_1404_image } __vm_flavor__: { get_param: flavor_medium } @@ -831,6 +875,7 @@ resources: echo "__network_name__" > /opt/config/network.txt echo "__openstack_username__" > /opt/config/openstack_username.txt echo "__openstack_api_key__" > /opt/config/openstack_password.txt + echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt echo "__openstack_region__" > /opt/config/region.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__docker_version__" > /opt/config/docker_version.txt @@ -841,13 +886,15 @@ resources: echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt - echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt + echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__vm_image_name__" > /opt/config/vm_image_name.txt @@ -897,8 +944,8 @@ resources: __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: vid_docker } + __gerrit_branch__: { get_param: vid_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __vid_repo__: { get_param: vid_repo } @@ -962,8 +1009,9 @@ resources: __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: sdnc_docker } + __gerrit_branch__: { get_param: sdnc_branch } + __dgbuilder_docker__: { get_param: dgbuilder_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __sdnc_repo__: { get_param: sdnc_repo } @@ -980,6 +1028,7 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__sdnc_repo__" > /opt/config/remote_repo.txt @@ -1039,8 +1088,8 @@ resources: __dns_ip_addr__: { get_param: dns_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __public_ip__: { get_attr: [sdc_floating_ip, floating_ip_address] } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: sdc_docker } + __gerrit_branch__: { get_param: sdc_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __sdc_repo__: { get_param: sdc_repo } @@ -1065,10 +1114,10 @@ resources: echo "__sdc_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/asdc_install.sh -o /opt/asdc_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdc_install.sh -o /opt/sdc_install.sh cd /opt - chmod +x asdc_install.sh - ./asdc_install.sh + chmod +x sdc_install.sh + ./sdc_install.sh # PORTAL instantiation @@ -1108,8 +1157,9 @@ resources: __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } __public_ip__: { get_attr: [portal_floating_ip, floating_ip_address] } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: portal_docker } + __gerrit_branch__: { get_param: portal_branch } + __cli_docker__: { get_param: cli_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __portal_repo__: { get_param: portal_repo } @@ -1127,6 +1177,7 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__cli_docker__" > /opt/config/cli_docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__portal_repo__" > /opt/config/remote_repo.txt @@ -1139,31 +1190,172 @@ resources: # DCAE Controller instantiation - dcae_c_private_port: +# dcae_c_private_port: +# type: OS::Neutron::Port +# properties: +# network: { get_resource: oam_onap } +# fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}] + +# dcae_c_floating_ip: +# type: OS::Neutron::FloatingIP +# properties: +# floating_network_id: { get_param: public_net_id } +# port_id: { get_resource: dcae_c_private_port } + +# dcae_c_vm: +# type: OS::Nova::Server +# properties: +# image: { get_param: ubuntu_1404_image } +# flavor: { get_param: flavor_medium } +# name: +# str_replace: +# template: base-dcae-controller +# params: +# base: { get_param: vm_base_name } +# key_name: { get_resource: vm_key } +# networks: +# - port: { get_resource: dcae_c_private_port } +# user_data_format: RAW +# user_data: +# str_replace: +# params: +# __nexus_repo__: { get_param: nexus_repo } +# __nexus_docker_repo__: { get_param: nexus_docker_repo } +# __nexus_username__: { get_param: nexus_username } +# __nexus_password__: { get_param: nexus_password } +# __nexus_url_snapshots__: { get_param: nexus_url_snapshot } +# __gitlab_branch__: { get_param: gitlab_branch } +# __dns_ip_addr__: { get_param: dns_ip_addr } +# __dcae_zone__: { get_param: dcae_zone } +# __dcae_state__: { get_param: dcae_state } +# __artifacts_version__: { get_param: artifacts_version } +# __tenant_id__: { get_param: openstack_tenant_id } +# __openstack_private_network_name__: { get_attr: [oam_onap, name] } +# __openstack_user__: { get_param: openstack_username } +# __openstack_password__: { get_param: openstack_api_key } +# __openstack_auth_method__: { get_param: openstack_auth_method } +# __key_name__: { get_param: key_name } +# __rand_str__: { get_resource: random-str } +# __pub_key__: { get_param: pub_key } +# __nexus_repo_root__: { get_param: nexus_repo_root } +# __openstack_region__: { get_param: openstack_region } +# __horizon_url__: { get_param: horizon_url } +# __keystone_url__: { get_param: keystone_url } +# __docker_version__: { get_param: dcae_docker } +# __gerrit_branch__: { get_param: dcae_branch } +# __dcae_code_version__: { get_param: dcae_code_version } +# __cloud_env__: { get_param: cloud_env } +# __public_net_id__: { get_param: public_net_id } +# __dcae_base_environment__: { get_param: dcae_base_environment } +# __dcae_ip_addr__: { get_param: dcae_ip_addr } +# __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } +# __dcae_db_ip_addr__: { get_param: dcae_db_ip_addr } +# __dcae_hdp1_ip_addr__: { get_param: dcae_hdp1_ip_addr } +# __dcae_hdp2_ip_addr__: { get_param: dcae_hdp2_ip_addr } +# __dcae_hdp3_ip_addr__: { get_param: dcae_hdp3_ip_addr } +# __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } +# __dcae_coll_float_ip__: { get_param: dcae_coll_float_ip } +# __dcae_db_float_ip__: { get_param: dcae_db_float_ip } +# __dcae_hdp1_float_ip__: { get_param: dcae_hdp1_float_ip } +# __dcae_hdp2_float_ip__: { get_param: dcae_hdp2_float_ip } +# __dcae_hdp3_float_ip__: { get_param: dcae_hdp3_float_ip } +# __external_dns__: { get_param: external_dns } +# __ubuntu_1404_image__: { get_param: ubuntu_1404_image } +# __ubuntu_1604_image__: { get_param: ubuntu_1604_image } +# __flavor_small__: { get_param: flavor_small } +# __flavor_medium__: { get_param: flavor_medium } +# __flavor_large__: { get_param: flavor_large } +# __flavor_xlarge__: { get_param: flavor_xlarge } +# __dcae_repo__: { get_param: dcae_repo } +# __mr_repo__: { get_param: mr_repo } +# template: | + #!/bin/bash + + # Create configuration files +# mkdir -p /opt/config +# echo "__nexus_repo__" > /opt/config/nexus_repo.txt +# echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt +# echo "__nexus_username__" > /opt/config/nexus_username.txt +# echo "__nexus_password__" > /opt/config/nexus_password.txt +# echo "__nexus_url_snapshots__" > /opt/config/nexus_url_snapshots.txt +# echo "__gitlab_branch__" > /opt/config/gitlab_branch.txt +# echo "__docker_version__" > /opt/config/docker_version.txt +# echo "__artifacts_version__" > /opt/config/artifacts_version.txt +# echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt +# echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt +# echo "__dcae_zone__" > /opt/config/dcae_zone.txt +# echo "__dcae_state__" > /opt/config/dcae_state.txt +# echo "__tenant_id__" > /opt/config/tenant_id.txt +# echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt +# echo "__openstack_user__" > /opt/config/openstack_user.txt +# echo "__openstack_password__" > /opt/config/openstack_password.txt +# echo "__openstack_auth_method__" > /opt/config/openstack_auth_method.txt +# echo "__key_name__" > /opt/config/key_name.txt +# echo "__rand_str__" > /opt/config/rand_str.txt +# echo "__pub_key__" > /opt/config/pub_key.txt +# echo "__nexus_repo_root__" > /opt/config/nexus_repo_root.txt +# echo "__openstack_region__" > /opt/config/openstack_region.txt +# echo "__horizon_url__" > /opt/config/horizon_url.txt +# echo "__keystone_url__" > /opt/config/keystone_url.txt +# echo "__cloud_env__" > /opt/config/cloud_env.txt +# echo "__public_net_id__" > /opt/config/public_net_id.txt +# echo "__dcae_base_environment__" > /opt/config/dcae_base_environment.txt +# echo "__dcae_code_version__" > /opt/config/dcae_code_version.txt +# echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt +# echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt +# echo "__dcae_db_ip_addr__" > /opt/config/dcae_db_ip_addr.txt +# echo "__dcae_hdp1_ip_addr__" > /opt/config/dcae_hdp1_ip_addr.txt +# echo "__dcae_hdp2_ip_addr__" > /opt/config/dcae_hdp2_ip_addr.txt +# echo "__dcae_hdp3_ip_addr__" > /opt/config/dcae_hdp3_ip_addr.txt +# echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt +# echo "__dcae_coll_float_ip__" > /opt/config/dcae_coll_float_ip.txt +# echo "__dcae_db_float_ip__" > /opt/config/dcae_db_float_ip.txt +# echo "__dcae_hdp1_float_ip__" > /opt/config/dcae_hdp1_float_ip.txt +# echo "__dcae_hdp2_float_ip__" > /opt/config/dcae_hdp2_float_ip.txt +# echo "__dcae_hdp3_float_ip__" > /opt/config/dcae_hdp3_float_ip.txt +# echo "__external_dns__" > /opt/config/external_dns.txt +# echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt +# echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt +# echo "__flavor_small__" > /opt/config/flavor_small.txt +# echo "__flavor_medium__" > /opt/config/flavor_medium.txt +# echo "__flavor_large__" > /opt/config/flavor_large.txt +# echo "__flavor_xlarge__" > /opt/config/flavor_xlarge.txt +# echo "__dcae_repo__" > /opt/config/remote_repo.txt +# echo "__mr_repo__" > /opt/config/mr_repo.txt + + # Download and run install script +# curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh +# cd /opt +# chmod +x dcae_install.sh +# ./dcae_install.sh + + + # Policy Engine instantiation + policy_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } - fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}] + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: policy_ip_addr }}] - dcae_c_floating_ip: + policy_floating_ip: type: OS::Neutron::FloatingIP properties: floating_network_id: { get_param: public_net_id } - port_id: { get_resource: dcae_c_private_port } + port_id: { get_resource: policy_private_port } - dcae_c_vm: + policy_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1404_image } - flavor: { get_param: flavor_medium } + flavor: { get_param: flavor_xlarge } name: str_replace: - template: base-dcae-controller + template: base-policy params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - - port: { get_resource: dcae_c_private_port } + - port: { get_resource: policy_private_port } user_data_format: RAW user_data: str_replace: @@ -1172,51 +1364,14 @@ resources: __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } - __nexus_url_snapshots__: { get_param: nexus_url_snapshot } - __gitlab_branch__: { get_param: gitlab_branch } - __dns_ip_addr__: { get_param: dns_ip_addr } - __dcae_zone__: { get_param: dcae_zone } - __dcae_state__: { get_param: dcae_state } __artifacts_version__: { get_param: artifacts_version } - __tenant_id__: { get_param: openstack_tenant_id } - __openstack_private_network_name__: { get_attr: [oam_onap, name] } - __openstack_user__: { get_param: openstack_username } - __openstack_password__: { get_param: openstack_api_key } - __openstack_auth_method__: { get_param: openstack_auth_method } - __key_name__: { get_param: key_name } - __rand_str__: { get_resource: random-str } - __pub_key__: { get_param: pub_key } - __nexus_repo_root__: { get_param: nexus_repo_root } - __openstack_region__: { get_param: openstack_region } - __horizon_url__: { get_param: horizon_url } - __keystone_url__: { get_param: keystone_url } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } - __dcae_code_version__: { get_param: dcae_code_version } + __dns_ip_addr__: { get_param: dns_ip_addr } + __public_ip__: { get_attr: [policy_floating_ip, floating_ip_address] } + __docker_version__: { get_param: policy_docker } + __gerrit_branch__: { get_param: policy_branch } __cloud_env__: { get_param: cloud_env } - __public_net_id__: { get_param: public_net_id } - __dcae_base_environment__: { get_param: dcae_base_environment } - __dcae_ip_addr__: { get_param: dcae_ip_addr } - __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } - __dcae_db_ip_addr__: { get_param: dcae_db_ip_addr } - __dcae_hdp1_ip_addr__: { get_param: dcae_hdp1_ip_addr } - __dcae_hdp2_ip_addr__: { get_param: dcae_hdp2_ip_addr } - __dcae_hdp3_ip_addr__: { get_param: dcae_hdp3_ip_addr } - __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } - __dcae_coll_float_ip__: { get_param: dcae_coll_float_ip } - __dcae_db_float_ip__: { get_param: dcae_db_float_ip } - __dcae_hdp1_float_ip__: { get_param: dcae_hdp1_float_ip } - __dcae_hdp2_float_ip__: { get_param: dcae_hdp2_float_ip } - __dcae_hdp3_float_ip__: { get_param: dcae_hdp3_float_ip } __external_dns__: { get_param: external_dns } - __ubuntu_1404_image__: { get_param: ubuntu_1404_image } - __ubuntu_1604_image__: { get_param: ubuntu_1604_image } - __flavor_small__: { get_param: flavor_small } - __flavor_medium__: { get_param: flavor_medium } - __flavor_large__: { get_param: flavor_large } - __flavor_xlarge__: { get_param: flavor_xlarge } - __dcae_repo__: { get_param: dcae_repo } - __mr_repo__: { get_param: mr_repo } + __policy_repo__: { get_param: policy_repo } template: | #!/bin/bash @@ -1226,85 +1381,48 @@ resources: echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt - echo "__nexus_url_snapshots__" > /opt/config/nexus_url_snapshots.txt - echo "__gitlab_branch__" > /opt/config/gitlab_branch.txt - echo "__docker_version__" > /opt/config/docker_version.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__public_ip__" > /opt/config/public_ip.txt + echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt - echo "__dcae_zone__" > /opt/config/dcae_zone.txt - echo "__dcae_state__" > /opt/config/dcae_state.txt - echo "__tenant_id__" > /opt/config/tenant_id.txt - echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt - echo "__openstack_user__" > /opt/config/openstack_user.txt - echo "__openstack_password__" > /opt/config/openstack_password.txt - echo "__openstack_auth_method__" > /opt/config/openstack_auth_method.txt - echo "__key_name__" > /opt/config/key_name.txt - echo "__rand_str__" > /opt/config/rand_str.txt - echo "__pub_key__" > /opt/config/pub_key.txt - echo "__nexus_repo_root__" > /opt/config/nexus_repo_root.txt - echo "__openstack_region__" > /opt/config/openstack_region.txt - echo "__horizon_url__" > /opt/config/horizon_url.txt - echo "__keystone_url__" > /opt/config/keystone_url.txt echo "__cloud_env__" > /opt/config/cloud_env.txt - echo "__public_net_id__" > /opt/config/public_net_id.txt - echo "__dcae_base_environment__" > /opt/config/dcae_base_environment.txt - echo "__dcae_code_version__" > /opt/config/dcae_code_version.txt - echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt - echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt - echo "__dcae_db_ip_addr__" > /opt/config/dcae_db_ip_addr.txt - echo "__dcae_hdp1_ip_addr__" > /opt/config/dcae_hdp1_ip_addr.txt - echo "__dcae_hdp2_ip_addr__" > /opt/config/dcae_hdp2_ip_addr.txt - echo "__dcae_hdp3_ip_addr__" > /opt/config/dcae_hdp3_ip_addr.txt - echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt - echo "__dcae_coll_float_ip__" > /opt/config/dcae_coll_float_ip.txt - echo "__dcae_db_float_ip__" > /opt/config/dcae_db_float_ip.txt - echo "__dcae_hdp1_float_ip__" > /opt/config/dcae_hdp1_float_ip.txt - echo "__dcae_hdp2_float_ip__" > /opt/config/dcae_hdp2_float_ip.txt - echo "__dcae_hdp3_float_ip__" > /opt/config/dcae_hdp3_float_ip.txt echo "__external_dns__" > /opt/config/external_dns.txt - echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt - echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt - echo "__flavor_small__" > /opt/config/flavor_small.txt - echo "__flavor_medium__" > /opt/config/flavor_medium.txt - echo "__flavor_large__" > /opt/config/flavor_large.txt - echo "__flavor_xlarge__" > /opt/config/flavor_xlarge.txt - echo "__dcae_repo__" > /opt/config/remote_repo.txt - echo "__mr_repo__" > /opt/config/mr_repo.txt + echo "__policy_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/policy_install.sh -o /opt/policy_install.sh cd /opt - chmod +x dcae_install.sh - ./dcae_install.sh + chmod +x policy_install.sh + ./policy_install.sh - # Policy Engine instantiation - policy_private_port: + # APP-C instantiation + appc_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } - fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: policy_ip_addr }}] + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: appc_ip_addr }}] - policy_floating_ip: + appc_floating_ip: type: OS::Neutron::FloatingIP properties: floating_network_id: { get_param: public_net_id } - port_id: { get_resource: policy_private_port } + port_id: { get_resource: appc_private_port } - policy_vm: + appc_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1404_image } - flavor: { get_param: flavor_xlarge } + flavor: { get_param: flavor_large } name: str_replace: - template: base-policy + template: base-appc params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - - port: { get_resource: policy_private_port } + - port: { get_resource: appc_private_port } user_data_format: RAW user_data: str_replace: @@ -1313,14 +1431,15 @@ resources: __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } + __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __public_ip__: { get_attr: [policy_floating_ip, floating_ip_address] } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: appc_docker } + __gerrit_branch__: { get_param: appc_branch } + __dgbuilder_docker__: { get_param: dgbuilder_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } - __policy_repo__: { get_param: policy_repo } + __appc_repo__: { get_param: appc_repo } template: | #!/bin/bash @@ -1332,46 +1451,47 @@ resources: echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt - echo "__public_ip__" > /opt/config/public_ip.txt + echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt - echo "__policy_repo__" > /opt/config/remote_repo.txt + echo "__appc_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/policy_install.sh -o /opt/policy_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh cd /opt - chmod +x policy_install.sh - ./policy_install.sh + chmod +x appc_install.sh + ./appc_install.sh - # APP-C instantiation - appc_private_port: + # CLAMP instantiation + clamp_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } - fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: appc_ip_addr }}] + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: clamp_ip_addr }}] - appc_floating_ip: + clamp_floating_ip: type: OS::Neutron::FloatingIP properties: floating_network_id: { get_param: public_net_id } - port_id: { get_resource: appc_private_port } + port_id: { get_resource: clamp_private_port } - appc_vm: + clamp_vm: type: OS::Nova::Server properties: - image: { get_param: ubuntu_1404_image } - flavor: { get_param: flavor_large } + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_medium } name: - str_replace: - template: base-appc + str_replace: + template: base-clamp params: - base: { get_param: vm_base_name } + base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - - port: { get_resource: appc_private_port } + - port: { get_resource: clamp_private_port } user_data_format: RAW user_data: str_replace: @@ -1380,14 +1500,19 @@ resources: __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } + __openstack_username__: { get_param: openstack_username } + __openstack_tenant_id__: { get_param: openstack_tenant_id } + __openstack_api_key__: { get_param: openstack_api_key } + __openstack_region__: { get_param: openstack_region } + __keystone_url__: { get_param: keystone_url } __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: clamp_docker } + __gerrit_branch__: { get_param: clamp_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } - __appc_repo__: { get_param: appc_repo } + __clamp_repo__: { get_param: clamp_repo } template: | #!/bin/bash @@ -1400,14 +1525,230 @@ resources: echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt + echo "__openstack_username__" > /opt/config/openstack_username.txt + echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt + echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt + echo "__openstack_region__" > /opt/config/openstack_region.txt + echo "__keystone_url__" > /opt/config/keystone.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt - echo "__appc_repo__" > /opt/config/remote_repo.txt + echo "__clamp_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh cd /opt - chmod +x appc_install.sh - ./appc_install.sh
\ No newline at end of file + chmod +x clamp_install.sh + ./clamp_install.sh + + + # OPEN-O VM instantiation + openo_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: openo_ip_addr }}] + + openo_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: openo_private_port } + + openo_vm: + type: OS::Nova::Server + properties: + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_xxlarge } + name: + str_replace: + template: base-openo-server + params: + base: { get_param: vm_base_name } + key_name: { get_resource: vm_key } + networks: + - port: { get_resource: openo_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __artifacts_version__: { get_param: artifacts_version } + __dns_ip_addr__: { get_param: dns_ip_addr } + __oam_network_cidr__: { get_param: oam_network_cidr } + __aai1_ip_addr__: { get_param: aai1_ip_addr } + __aai2_ip_addr__: { get_param: aai2_ip_addr } + __appc_ip_addr__: { get_param: appc_ip_addr } + __dcae_ip_addr__: { get_param: dcae_ip_addr } + __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } + __mr_ip_addr__: { get_param: mr_ip_addr } + __policy_ip_addr__: { get_param: policy_ip_addr } + __portal_ip_addr__: { get_param: portal_ip_addr } + __robot_ip_addr__: { get_param: robot_ip_addr } + __sdc_ip_addr__: { get_param: sdc_ip_addr } + __sdnc_ip_addr__: { get_param: sdnc_ip_addr } + __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_ip_addr } + __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } + __vnfsdk_branch__: { get_param: vnfsdk_branch } + __msb_docker__: { get_param: msb_docker } + __mvim_docker__: { get_param: mvim_docker } + __vfc_docker__: { get_param: vfc_docker } + __uui_docker__: { get_param: uui_docker } + __esr_docker__: { get_param: esr_docker } + __vnfsdk_repo__: { get_param: vnfsdk_repo } + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt + echo "__nexus_username__" > /opt/config/nexus_username.txt + echo "__nexus_password__" > /opt/config/nexus_password.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt + echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__external_dns__" > /opt/config/external_dns.txt + echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt + echo "__msb_docker__" > /opt/config/msb_docker.txt + echo "__mvim_docker__" > /opt/config/mvim_docker.txt + echo "__vfc_docker__" > /opt/config/vfc_docker.txt + echo "__uui_docker__" > /opt/config/uui_docker.txt + echo "__esr_docker__" > /opt/config/esr_docker.txt + echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt + + # Create env file with the IP address of all ONAP components + echo "export AAI_IP1=__aai1_ip_addr__" >> /opt/config/onap_ips.txt + echo "export AAI_IP2=__aai2_ip_addr__" >> /opt/config/onap_ips.txt + echo "export APPC_IP=__appc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export DCAE_IP=__dcae_ip_addr__" >> /opt/config/onap_ips.txt + echo "export DCAE_COLL_IP=__dcae_coll_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SO_IP=__so_ip_addr__" >> /opt/config/onap_ips.txt + echo "export MR_IP=__mr_ip_addr__" >> /opt/config/onap_ips.txt + echo "export POLICY_IP=__policy_ip_addr__" >> /opt/config/onap_ips.txt + echo "export PORTAL_IP=__portal_ip_addr__" >> /opt/config/onap_ips.txt + echo "export ROBOT_IP=__robot_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SDC_IP=__sdc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SDNC_IP=__sdnc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export VID_IP=__vid_ip_addr__" >> /opt/config/onap_ips.txt + echo "export CLAMP_IP=__clamp_ip_addr__" >> /opt/config/onap_ips.txt + echo "export OPENO_IP=__openo_ip_addr__" >> /opt/config/onap_ips.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/openo_install.sh -o /opt/openo_install.sh + cd /opt + chmod +x openo_install.sh + ./openo_install.sh + + + # DCAE GEN 2 Controller instantiation + dcae_c_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}] + + dcae_c_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: dcae_c_private_port } + + dcae_c_vm: + type: OS::Nova::Server + properties: + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_medium } + name: + str_replace: + template: base-dcae-controller + params: + base: { get_param: vm_base_name } + key_name: { get_resource: dcae_vm_key } + networks: + - port: { get_resource: dcae_c_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __dns_ip_addr__: { get_param: dns_ip_addr } + __dcae_zone__: { get_param: dcae_zone } + __artifacts_version__: { get_param: artifacts_version } + __tenant_id__: { get_param: openstack_tenant_id } + __openstack_private_network_name__: { get_attr: [oam_onap, name] } + __openstack_user__: { get_param: openstack_username } + __openstack_password__: { get_param: openstack_api_key } + __key_name__: { get_param: dcae_key_name } + __pub_key__: { get_param: dcae_pub_key } + __private_key__: { get_attr: [ dcae_vm_key, private_key ] } + __openstack_region__: { get_param: openstack_region } + __keystone_url__: { get_param: keystone_url } + __docker_version__: { get_param: dcae_docker } + __dcae_repo__: { get_param: dcae_repo } + __gerrit_branch__: { get_param: dcae_branch } + __cloud_env__: { get_param: cloud_env } + __public_net_id__: { get_param: public_net_id } + __dcae_ip_addr__: { get_param: dcae_ip_addr } + __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } + __external_dns__: { get_param: external_dns } + __ubuntu_1604_image__: { get_param: ubuntu_1604_image } + __centos_7_image__: { get_param: centos_7_image } + __security_group__ : { get_param: security_group } + __flavor_medium__: { get_param: flavor_medium } + __mac_addr__: { get_attr: [dcae_c_private_port, mac_address] } + __rand_str__: { get_resource: random-str } + + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt + echo "__nexus_username__" > /opt/config/nexus_username.txt + echo "__nexus_password__" > /opt/config/nexus_password.txt + echo "__docker_version__" > /opt/config/docker_version.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dcae_zone__" > /opt/config/dcae_zone.txt + echo "__tenant_id__" > /opt/config/tenant_id.txt + echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt + echo "__openstack_user__" > /opt/config/openstack_user.txt + echo "__openstack_password__" > /opt/config/openstack_password.txt + echo "__key_name__" > /opt/config/key_name.txt + echo "__pub_key__" > /opt/config/pub_key.txt + echo "__private_key__" > /opt/config/priv_key + echo "__openstack_region__" > /opt/config/openstack_region.txt + echo "__keystone_url__" > /opt/config/keystone_url.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__public_net_id__" > /opt/config/public_net_id.txt + echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt + echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt + echo "__external_dns__" > /opt/config/external_dns.txt + echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt + echo "__centos_7_image__" > /opt/config/centos_7_image.txt + echo "__security_group__" > /opt/config/security_group.txt + echo "__flavor_medium__" > /opt/config/flavor_medium.txt + echo "__dcae_repo__" > /opt/config/remote_repo.txt + echo "__mac_addr__" > /opt/config/mac_addr.txt + echo "__rand_str__" > /opt/config/rand_str.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh + cd /opt + chmod +x dcae2_install.sh + ./dcae2_install.sh
\ No newline at end of file diff --git a/heat/ONAP/onap_openstack_float.env b/heat/ONAP/onap_openstack_float.env index e2baf6ea..e970b7f4 100644 --- a/heat/ONAP/onap_openstack_float.env +++ b/heat/ONAP/onap_openstack_float.env @@ -16,6 +16,8 @@ parameters: ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE + centos_7_image: PUT THE CENTOS 7 IMAGE NAME HERE + flavor_small: PUT THE SMALL FLAVOR NAME HERE flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE @@ -24,12 +26,20 @@ parameters: flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE + flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE + + security_group: PUT THE NAME OF THE SECURITY GROUP HERE + vm_base_name: vm1 key_name: onap_key + dcae_key_name: dcae_key + pub_key: PUT YOUR PUBLIC KEY HERE + dcae_pub_key: PUT YOUR DCAE PUBLIC KEY HERE + nexus_repo: https://nexus.onap.org/content/sites/raw nexus_docker_repo: nexus3.onap.org:10001 @@ -42,10 +52,6 @@ parameters: artifacts_version: 1.1.0-SNAPSHOT - docker_version: 1.1-STAGING-latest - - gerrit_branch: master - openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE openstack_username: PUT YOUR OPENSTACK USERNAME HERE @@ -58,7 +64,7 @@ parameters: horizon_url: PUT THE HORIZON URL HERE - keystone_url: PUT THE KEYSTONE URL HERE + keystone_url: PUT THE KEYSTONE URL HERE (do not include version number) cloud_env: openstack @@ -71,6 +77,7 @@ parameters: dns_list: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems) external_dns: PUT THE FIRST ADDRESS OF THE EXTERNAL DNS LIST HERE + oam_network_cidr: 10.0.0.0/16 ### Floating IP addresses ### @@ -84,7 +91,7 @@ parameters: dcae_hdp2_float_ip: PUT DCAE HADOOP VM2 FLOATING IP HERE dcae_hdp3_float_ip: PUT DCAE HADOOP VM3 FLOATING IP HERE dns_float_ip: PUT DNS FLOATING IP HERE - mso_float_ip: PUT MSO FLOATING IP HERE + so_float_ip: PUT SO FLOATING IP HERE mr_float_ip: PUT MESSAGE ROUTER FLOATING IP HERE policy_float_ip: PUT POLICY FLOATING IP HERE portal_float_ip: PUT PORTAL FLOATING IP HERE @@ -92,11 +99,11 @@ parameters: sdc_float_ip: PUT SDC FLOATING IP HERE sdnc_float_ip: PUT SDN-C FLOATING IP HERE vid_float_ip: PUT VID FLOATING IP HERE - + clamp_float_ip: PUT CLAMP FLOATING IP HERE + openo_float_ip: PUT OPEN-O FLOATING IP HERE ### Private IP addresses ### - oam_network_cidr: 10.0.0.0/16 aai1_ip_addr: 10.0.1.1 aai2_ip_addr: 10.0.1.2 appc_ip_addr: 10.0.2.1 @@ -107,7 +114,7 @@ parameters: dcae_hdp2_ip_addr: 10.0.4.104 dcae_hdp3_ip_addr: 10.0.4.105 dns_ip_addr: 10.0.100.1 - mso_ip_addr: 10.0.5.1 + so_ip_addr: 10.0.5.1 mr_ip_addr: 10.0.11.1 policy_ip_addr: 10.0.6.1 portal_ip_addr: 10.0.9.1 @@ -115,6 +122,8 @@ parameters: sdc_ip_addr: 10.0.3.1 sdnc_ip_addr: 10.0.7.1 vid_ip_addr: 10.0.8.1 + clamp_ip_addr: 10.0.12.1 + openo_ip_addr: 10.0.14.1 ########################### # # @@ -136,6 +145,47 @@ parameters: dcae_code_version: 1.1.0 + + ################################ + # # + # Docker versions and branches # + # # + ################################ + + aai_branch: master + appc_branch: master + so_branch: master + mr_branch: master + dcae_branch: master + policy_branch: master + portal_branch: master + robot_branch: master + sdc_branch: master + sdnc_branch: master + vid_branch: master + clamp_branch: master + vnfsdk_branch: master + + aai_docker: 1.1-STAGING-latest + appc_docker: 1.1-STAGING-latest + so_docker: 1.1-STAGING-latest + mr_docker: 1.1-STAGING-latest + dcae_docker: 1.1-latest + policy_docker: 1.1-STAGING-latest + portal_docker: 1.3-STAGING-latest + robot_docker: 1.1-STAGING-latest + sdc_docker: 1.1-STAGING-latest + sdnc_docker: 1.2-STAGING-latest + vid_docker: 1.1-STAGING-latest + clamp_docker: 1.1-STAGING-latest + msb_docker: latest + mvim_docker: latest + vfc_docker: latest + uui_docker: latest + esr_docker: latest + dgbuilder_docker: 0.1-STAGING-latest + cli_docker: 1.1-STAGING-latest + ##################### # # # ONAP repositories # @@ -145,10 +195,12 @@ parameters: appc_repo: http://gerrit.onap.org/r/appc/deployment.git dcae_repo: http://gerrit.onap.org/r/dcae/demo/startup/controller.git mr_repo: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git - mso_repo: http://gerrit.onap.org/r/so/docker-config.git + so_repo: http://gerrit.onap.org/r/so/docker-config.git policy_repo: http://gerrit.onap.org/r/policy/docker.git portal_repo: http://gerrit.onap.org/r/portal.git robot_repo: http://gerrit.onap.org/r/testsuite/properties.git sdc_repo: http://gerrit.onap.org/r/sdc.git sdnc_repo: http://gerrit.onap.org/r/sdnc/oam.git vid_repo: http://gerrit.onap.org/r/vid.git + clamp_repo: http://gerrit.onap.org/r/clamp.git + vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git diff --git a/heat/ONAP/onap_openstack_float.yaml b/heat/ONAP/onap_openstack_float.yaml index bc15fa7f..46c49033 100644 --- a/heat/ONAP/onap_openstack_float.yaml +++ b/heat/ONAP/onap_openstack_float.yaml @@ -46,11 +46,11 @@ parameters: public_subnet_id: type: string - description: Public network subnet id + description: Public subnet for floating IP address allocation router_gateway_ip: type: string - description: Public network gateway IP address + description: Router gateway IP address ubuntu_1404_image: type: string @@ -60,6 +60,10 @@ parameters: type: string description: Name of the Ubuntu 16.04 image + centos_7_image: + type: string + description: Name of the CentOS 7 image + flavor_small: type: string description: Name of the Small Flavor supported by the cloud provider @@ -76,6 +80,14 @@ parameters: type: string description: Name of the Extra Large Flavor supported by the cloud provider + flavor_xxlarge: + type: string + description: Name of the Extra Extra Large Flavor supported by the cloud provider + + security_group: + type: string + description: Security group used by DCAE GEN 2 + vm_base_name: type: string description: Base name of ONAP VMs @@ -84,10 +96,18 @@ parameters: type: string description: Public/Private key pair name + dcae_key_name: + type: string + description: Public/Private key pair name for DCAE GEN 2 + pub_key: type: string description: Public key to be installed on the compute instance + dcae_pub_key: + type: string + description: Public key to be installed on the DCAE GEN 2 compute instance + nexus_repo: type: string description: Complete URL for the Nexus repository. @@ -108,15 +128,6 @@ parameters: type: string description: Artifacts version of ONAP components - docker_version: - type: string - label: Version number of ONAP docker images - - gerrit_branch: - type: string - label: Gerrit code branch - description: Gerrit branch where to download the code from - dmaap_topic: type: string description: DMaaP Topic name @@ -135,7 +146,7 @@ parameters: openstack_api_key: type: string - description: Openstack API Key + description: Openstack password or API Key horizon_url: type: string @@ -149,6 +160,7 @@ parameters: type: string description: Cloud Provider Name + ###################### # # # Network parameters # @@ -163,155 +175,94 @@ parameters: type: string description: First element of the dns_list for ONAP network + oam_network_cidr: + type: string + description: CIDR of the OAM ONAP network + ### Floating IP addresses ### aai1_float_ip: type: string - description: AAI Instance 1 Floating IP Address - aai2_float_ip: type: string - description: AAI Instance 2 Floating IP Address - appc_float_ip: type: string - description: APP-C Floating IP Address - dcae_float_ip: type: string - description: DCAE Floating IP Address - dcae_coll_float_ip: type: string - description: DCAE Collector Floating IP Address - dcae_db_float_ip: type: string - description: DCAE Collector Database Floating IP Address - dcae_hdp1_float_ip: type: string - description: Hadoop VM1 Floating IP Address - dcae_hdp2_float_ip: type: string - description: Hadoop VM2 Floating IP Address - dcae_hdp3_float_ip: type: string - description: Hadoop VM3 Floating IP Address - dns_float_ip: type: string - description: DNS Floating IP Address - - mso_float_ip: + so_float_ip: type: string - description: MSO Floating IP Address - mr_float_ip: type: string - description: Message Router Floating IP Address - policy_float_ip: type: string - description: Policy Engine Floating IP Address - portal_float_ip: type: string - description: Portal Floating IP Address - robot_float_ip: type: string - description: Robot Framework Floating IP Address - sdc_float_ip: type: string - description: SDC Floating IP Address - sdnc_float_ip: type: string - description: SDN-C Floating IP Address - vid_float_ip: type: string - description: VID Floating IP Address - - ### Private IP addresses ### - oam_network_cidr: + clamp_float_ip: type: string - description: CIDR of the OAM ONAP network + openo_float_ip: + type: string + + ### Private IP addresses ### aai1_ip_addr: type: string - description: AAI Instance 1 IP Address - aai2_ip_addr: type: string - description: AAI Instance 2 IP Address - appc_ip_addr: type: string - description: APP-C IP Address - dcae_ip_addr: type: string - description: DCAE IP Address - dcae_coll_ip_addr: type: string - description: DCAE Collector IP Address - dcae_db_ip_addr: type: string - description: DCAE Database IP Address - dcae_hdp1_ip_addr: type: string - description: Hadoop VM1 IP Address - dcae_hdp2_ip_addr: type: string - description: Hadoop VM2 IP Address - dcae_hdp3_ip_addr: type: string - description: Hadoop VM3 IP Address - dns_ip_addr: type: string - description: DNS IP Address - - mso_ip_addr: + so_ip_addr: type: string - description: MSO IP Address - mr_ip_addr: type: string - description: Message Router IP Address - policy_ip_addr: type: string - description: Policy Engine IP Address - portal_ip_addr: type: string - description: Portal IP Address - robot_ip_addr: type: string - description: Robot Framework IP Address - sdc_ip_addr: type: string - description: SDC IP Address - sdnc_ip_addr: type: string - description: SDN-C IP Address - vid_ip_addr: type: string - description: VID IP Address + clamp_ip_addr: + type: string + openo_ip_addr: + type: string ########################### @@ -360,47 +311,102 @@ parameters: aai_repo: type: string - description: AAI repository - appc_repo: type: string - description: APPC repository - dcae_repo: type: string - description: DCAE repository - mr_repo: type: string - description: Message Router repository - - mso_repo: + so_repo: type: string - description: MSO repository - policy_repo: type: string - description: Policy repository - portal_repo: type: string - description: Portal repository - robot_repo: type: string - description: Robot repository - sdc_repo: type: string - description: SDC repository - sdnc_repo: type: string - description: SDNC repository - vid_repo: type: string - description: VID repository + clamp_repo: + type: string + vnfsdk_repo: + type: string + + ################################ + # # + # Docker versions and branches # + # # + ################################ + + aai_docker: + type: string + appc_docker: + type: string + so_docker: + type: string + mr_docker: + type: string + dcae_docker: + type: string + policy_docker: + type: string + portal_docker: + type: string + robot_docker: + type: string + sdc_docker: + type: string + sdnc_docker: + type: string + vid_docker: + type: string + clamp_docker: + type: string + msb_docker: + type: string + mvim_docker: + type: string + vfc_docker: + type: string + uui_docker: + type: string + esr_docker: + type: string + dgbuilder_docker: + type: string + cli_docker: + type: string + + aai_branch: + type: string + appc_branch: + type: string + so_branch: + type: string + mr_branch: + type: string + dcae_branch: + type: string + policy_branch: + type: string + portal_branch: + type: string + robot_branch: + type: string + sdc_branch: + type: string + sdnc_branch: + type: string + vid_branch: + type: string + clamp_branch: + type: string + vnfsdk_branch: + type: string ############# @@ -429,6 +435,18 @@ resources: public_key: { get_param: pub_key } save_private_key: false + # Public key used to access DCAE GEN 2 + dcae_vm_key: + type: OS::Nova::KeyPair + properties: + name: + str_replace: + template: base_rand + params: + base: { get_param: dcae_key_name } + rand: { get_resource: random-str } + public_key: { get_param: dcae_pub_key } + save_private_key: true # ONAP management private network oam_onap: @@ -508,7 +526,7 @@ resources: __appc_ip_addr__: { get_param: appc_ip_addr } __dcae_ip_addr__: { get_param: dcae_ip_addr } __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } - __mso_ip_addr__: { get_param: mso_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } __portal_ip_addr__: { get_param: portal_ip_addr } @@ -516,6 +534,8 @@ resources: __sdc_ip_addr__: { get_param: sdc_ip_addr } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_ip_addr } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } template: | @@ -533,7 +553,7 @@ resources: echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt - echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt @@ -541,6 +561,8 @@ resources: echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt + echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script @@ -589,9 +611,9 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } + __docker_version__: { get_param: aai_docker } __cloud_env__: { get_param: cloud_env } - __gerrit_branch__: { get_param: gerrit_branch } + __gerrit_branch__: { get_param: aai_branch } __external_dns__: { get_param: external_dns } __aai_repo__: { get_param: aai_repo } template: | @@ -657,9 +679,9 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } + __docker_version__: { get_param: aai_docker } __cloud_env__: { get_param: cloud_env } - __gerrit_branch__: { get_param: gerrit_branch } + __gerrit_branch__: { get_param: aai_branch } __external_dns__: { get_param: external_dns } __aai_repo__: { get_param: aai_repo } template: | @@ -688,33 +710,33 @@ resources: ./aai_install.sh - # MSO instantiation - mso_private_port: + # SO instantiation + so_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } - fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: mso_ip_addr }}] + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: so_ip_addr }}] - mso_floating_ip: + so_floating_ip: type: OS::Neutron::FloatingIP properties: floating_network_id: { get_param: public_net_id } - port_id: { get_resource: mso_private_port } - floating_ip_address: { get_param: mso_float_ip } + port_id: { get_resource: so_private_port } + floating_ip_address: { get_param: so_float_ip } - mso_vm: + so_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } flavor: { get_param: flavor_large } name: str_replace: - template: base-mso + template: base-so params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - - port: { get_resource: mso_private_port } + - port: { get_resource: so_private_port } user_data_format: RAW user_data: str_replace: @@ -731,11 +753,11 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: so_docker } + __gerrit_branch__: { get_param: so_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } - __mso_repo__: { get_param: mso_repo } + __so_repo__: { get_param: so_repo } template: | #!/bin/bash @@ -757,13 +779,13 @@ resources: echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt - echo "__mso_repo__" > /opt/config/remote_repo.txt + echo "__so_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mso_install.sh -o /opt/mso_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/so_install.sh -o /opt/so_install.sh cd /opt - chmod +x mso_install.sh - ./mso_install.sh + chmod +x so_install.sh + ./so_install.sh # Message Router instantiation @@ -803,7 +825,7 @@ resources: __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __gerrit_branch__: { get_param: gerrit_branch } + __gerrit_branch__: { get_param: mr_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __mr_repo__: { get_param: mr_repo } @@ -848,7 +870,7 @@ resources: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } - flavor: { get_param: flavor_small } + flavor: { get_param: flavor_medium } name: str_replace: template: base-robot @@ -868,23 +890,26 @@ resources: __network_name__: { get_attr: [oam_onap, name] } __openstack_username__: { get_param: openstack_username } __openstack_api_key__: { get_param : openstack_api_key } + __openstack_tenant_id__: { get_param: openstack_tenant_id } __artifacts_version__: { get_param: artifacts_version } __openstack_region__: { get_param: openstack_region } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: robot_docker } + __gerrit_branch__: { get_param: robot_branch } __keystone_url__: { get_param: keystone_url } __aai1_ip_addr__: { get_param: aai1_ip_addr } __aai2_ip_addr__: { get_param: aai2_ip_addr } __appc_ip_addr__: { get_param: appc_ip_addr } __dcae_ip_addr__: { get_param: dcae_ip_addr } - __mso_ip_addr__: { get_param: mso_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } __portal_ip_addr__: { get_param: portal_ip_addr } __sdc_ip_addr__: { get_param: sdc_ip_addr } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_ip_addr } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __vm_image_name__: { get_param: ubuntu_1404_image } @@ -902,6 +927,7 @@ resources: echo "__network_name__" > /opt/config/network.txt echo "__openstack_username__" > /opt/config/openstack_username.txt echo "__openstack_api_key__" > /opt/config/openstack_password.txt + echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt echo "__openstack_region__" > /opt/config/region.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__docker_version__" > /opt/config/docker_version.txt @@ -912,13 +938,15 @@ resources: echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt - echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt + echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__vm_image_name__" > /opt/config/vm_image_name.txt @@ -969,8 +997,8 @@ resources: __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: vid_docker } + __gerrit_branch__: { get_param: vid_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __vid_repo__: { get_param: vid_repo } @@ -1035,8 +1063,9 @@ resources: __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: sdnc_docker } + __gerrit_branch__: { get_param: sdnc_branch } + __dgbuilder_docker__: { get_param: dgbuilder_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __sdnc_repo__: { get_param: sdnc_repo } @@ -1053,6 +1082,7 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__sdnc_repo__" > /opt/config/remote_repo.txt @@ -1113,8 +1143,8 @@ resources: __dns_ip_addr__: { get_param: dns_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __public_ip__: { get_attr: [sdc_floating_ip, floating_ip_address] } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: sdc_docker } + __gerrit_branch__: { get_param: sdc_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __sdc_repo__: { get_param: sdc_repo } @@ -1139,10 +1169,10 @@ resources: echo "__sdc_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/asdc_install.sh -o /opt/asdc_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdc_install.sh -o /opt/sdc_install.sh cd /opt - chmod +x asdc_install.sh - ./asdc_install.sh + chmod +x sdc_install.sh + ./sdc_install.sh # PORTAL instantiation @@ -1183,9 +1213,10 @@ resources: __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } __public_ip__: { get_attr: [portal_floating_ip, floating_ip_address] } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: portal_docker } + __gerrit_branch__: { get_param: portal_branch } __cloud_env__: { get_param: cloud_env } + __cli_docker__: { get_param: cli_docker } __external_dns__: { get_param: external_dns } __portal_repo__: { get_param: portal_repo } template: | @@ -1202,6 +1233,7 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__cli_docker__" > /opt/config/cli_docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__portal_repo__" > /opt/config/remote_repo.txt @@ -1214,32 +1246,174 @@ resources: # DCAE Controller instantiation - dcae_c_private_port: +# dcae_c_private_port: +# type: OS::Neutron::Port +# properties: +# network: { get_resource: oam_onap } +# fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}] + +# dcae_c_floating_ip: +# type: OS::Neutron::FloatingIP +# properties: +# floating_network_id: { get_param: public_net_id } +# port_id: { get_resource: dcae_c_private_port } +# floating_ip_address: { get_param: dcae_float_ip } + +# dcae_c_vm: +# type: OS::Nova::Server +# properties: +# image: { get_param: ubuntu_1404_image } +# flavor: { get_param: flavor_medium } +# name: +# str_replace: +# template: base-dcae-controller +# params: +# base: { get_param: vm_base_name } +# key_name: { get_resource: vm_key } +# networks: +# - port: { get_resource: dcae_c_private_port } +# user_data_format: RAW +# user_data: +# str_replace: +# params: +# __nexus_repo__: { get_param: nexus_repo } +# __nexus_docker_repo__: { get_param: nexus_docker_repo } +# __nexus_username__: { get_param: nexus_username } +# __nexus_password__: { get_param: nexus_password } +# __nexus_url_snapshots__: { get_param: nexus_url_snapshot } +# __gitlab_branch__: { get_param: gitlab_branch } +# __dns_ip_addr__: { get_param: dns_ip_addr } +# __dcae_zone__: { get_param: dcae_zone } +# __dcae_state__: { get_param: dcae_state } +# __artifacts_version__: { get_param: artifacts_version } +# __tenant_id__: { get_param: openstack_tenant_id } +# __openstack_private_network_name__: { get_attr: [oam_onap, name] } +# __openstack_user__: { get_param: openstack_username } +# __openstack_password__: { get_param: openstack_api_key } +# __openstack_auth_method__: { get_param: openstack_auth_method } +# __key_name__: { get_param: key_name } +# __rand_str__: { get_resource: random-str } +# __pub_key__: { get_param: pub_key } +# __nexus_repo_root__: { get_param: nexus_repo_root } +# __openstack_region__: { get_param: openstack_region } +# __horizon_url__: { get_param: horizon_url } +# __keystone_url__: { get_param: keystone_url } +# __docker_version__: { get_param: dcae_docker } +# __gerrit_branch__: { get_param: dcae_branch } +# __dcae_code_version__: { get_param: dcae_code_version } +# __cloud_env__: { get_param: cloud_env } +# __public_net_id__: { get_param: public_net_id } +# __dcae_base_environment__: { get_param: dcae_base_environment } +# __dcae_ip_addr__: { get_param: dcae_ip_addr } +# __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } +# __dcae_db_ip_addr__: { get_param: dcae_db_ip_addr } +# __dcae_hdp1_ip_addr__: { get_param: dcae_hdp1_ip_addr } +# __dcae_hdp2_ip_addr__: { get_param: dcae_hdp2_ip_addr } +# __dcae_hdp3_ip_addr__: { get_param: dcae_hdp3_ip_addr } +# __dcae_float_ip__: { get_param: dcae_float_ip } +# __dcae_coll_float_ip__: { get_param: dcae_coll_float_ip } +# __dcae_db_float_ip__: { get_param: dcae_db_float_ip } +# __dcae_hdp1_float_ip__: { get_param: dcae_hdp1_float_ip } +# __dcae_hdp2_float_ip__: { get_param: dcae_hdp2_float_ip } +# __dcae_hdp3_float_ip__: { get_param: dcae_hdp3_float_ip } +# __external_dns__: { get_param: external_dns } +# __ubuntu_1404_image__: { get_param: ubuntu_1404_image } +# __ubuntu_1604_image__: { get_param: ubuntu_1604_image } +# __flavor_small__: { get_param: flavor_small } +# __flavor_medium__: { get_param: flavor_medium } +# __flavor_large__: { get_param: flavor_large } +# __flavor_xlarge__: { get_param: flavor_xlarge } +# __dcae_repo__: { get_param: dcae_repo } +# __mr_repo__: { get_param: mr_repo } +# template: | + #!/bin/bash + + # Create configuration files +# mkdir -p /opt/config +# echo "__nexus_repo__" > /opt/config/nexus_repo.txt +# echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt +# echo "__nexus_username__" > /opt/config/nexus_username.txt +# echo "__nexus_password__" > /opt/config/nexus_password.txt +# echo "__nexus_url_snapshots__" > /opt/config/nexus_url_snapshots.txt +# echo "__gitlab_branch__" > /opt/config/gitlab_branch.txt +# echo "__docker_version__" > /opt/config/docker_version.txt +# echo "__artifacts_version__" > /opt/config/artifacts_version.txt +# echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt +# echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt +# echo "__dcae_zone__" > /opt/config/dcae_zone.txt +# echo "__dcae_state__" > /opt/config/dcae_state.txt +# echo "__tenant_id__" > /opt/config/tenant_id.txt +# echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt +# echo "__openstack_user__" > /opt/config/openstack_user.txt +# echo "__openstack_password__" > /opt/config/openstack_password.txt +# echo "__openstack_auth_method__" > /opt/config/openstack_auth_method.txt +# echo "__key_name__" > /opt/config/key_name.txt +# echo "__rand_str__" > /opt/config/rand_str.txt +# echo "__pub_key__" > /opt/config/pub_key.txt +# echo "__nexus_repo_root__" > /opt/config/nexus_repo_root.txt +# echo "__openstack_region__" > /opt/config/openstack_region.txt +# echo "__horizon_url__" > /opt/config/horizon_url.txt +# echo "__keystone_url__" > /opt/config/keystone_url.txt +# echo "__cloud_env__" > /opt/config/cloud_env.txt +# echo "__public_net_id__" > /opt/config/public_net_id.txt +# echo "__dcae_base_environment__" > /opt/config/dcae_base_environment.txt +# echo "__dcae_code_version__" > /opt/config/dcae_code_version.txt +# echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt +# echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt +# echo "__dcae_db_ip_addr__" > /opt/config/dcae_db_ip_addr.txt +# echo "__dcae_hdp1_ip_addr__" > /opt/config/dcae_hdp1_ip_addr.txt +# echo "__dcae_hdp2_ip_addr__" > /opt/config/dcae_hdp2_ip_addr.txt +# echo "__dcae_hdp3_ip_addr__" > /opt/config/dcae_hdp3_ip_addr.txt +# echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt +# echo "__dcae_coll_float_ip__" > /opt/config/dcae_coll_float_ip.txt +# echo "__dcae_db_float_ip__" > /opt/config/dcae_db_float_ip.txt +# echo "__dcae_hdp1_float_ip__" > /opt/config/dcae_hdp1_float_ip.txt +# echo "__dcae_hdp2_float_ip__" > /opt/config/dcae_hdp2_float_ip.txt +# echo "__dcae_hdp3_float_ip__" > /opt/config/dcae_hdp3_float_ip.txt +# echo "__external_dns__" > /opt/config/external_dns.txt +# echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt +# echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt +# echo "__flavor_small__" > /opt/config/flavor_small.txt +# echo "__flavor_medium__" > /opt/config/flavor_medium.txt +# echo "__flavor_large__" > /opt/config/flavor_large.txt +# echo "__flavor_xlarge__" > /opt/config/flavor_xlarge.txt +# echo "__dcae_repo__" > /opt/config/remote_repo.txt +# echo "__mr_repo__" > /opt/config/mr_repo.txt + + # Download and run install script +# curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh +# cd /opt +# chmod +x dcae_install.sh +# ./dcae_install.sh + + + # Policy Engine instantiation + policy_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } - fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}] + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: policy_ip_addr }}] - dcae_c_floating_ip: + policy_floating_ip: type: OS::Neutron::FloatingIP properties: floating_network_id: { get_param: public_net_id } - port_id: { get_resource: dcae_c_private_port } - floating_ip_address: { get_param: dcae_float_ip } + port_id: { get_resource: policy_private_port } + floating_ip_address: { get_param: policy_float_ip } - dcae_c_vm: + policy_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1404_image } - flavor: { get_param: flavor_medium } + flavor: { get_param: flavor_xlarge } name: str_replace: - template: base-dcae-controller + template: base-policy params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - - port: { get_resource: dcae_c_private_port } + - port: { get_resource: policy_private_port } user_data_format: RAW user_data: str_replace: @@ -1248,51 +1422,14 @@ resources: __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } - __nexus_url_snapshots__: { get_param: nexus_url_snapshot } - __gitlab_branch__: { get_param: gitlab_branch } - __dns_ip_addr__: { get_param: dns_ip_addr } - __dcae_zone__: { get_param: dcae_zone } - __dcae_state__: { get_param: dcae_state } __artifacts_version__: { get_param: artifacts_version } - __tenant_id__: { get_param: openstack_tenant_id } - __openstack_private_network_name__: { get_attr: [oam_onap, name] } - __openstack_user__: { get_param: openstack_username } - __openstack_password__: { get_param: openstack_api_key } - __openstack_auth_method__: { get_param: openstack_auth_method } - __key_name__: { get_param: key_name } - __rand_str__: { get_resource: random-str } - __pub_key__: { get_param: pub_key } - __nexus_repo_root__: { get_param: nexus_repo_root } - __openstack_region__: { get_param: openstack_region } - __horizon_url__: { get_param: horizon_url } - __keystone_url__: { get_param: keystone_url } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } - __dcae_code_version__: { get_param: dcae_code_version } + __dns_ip_addr__: { get_param: dns_ip_addr } + __public_ip__: { get_attr: [policy_floating_ip, floating_ip_address] } + __docker_version__: { get_param: policy_docker } + __gerrit_branch__: { get_param: policy_branch } __cloud_env__: { get_param: cloud_env } - __public_net_id__: { get_param: public_net_id } - __dcae_base_environment__: { get_param: dcae_base_environment } - __dcae_ip_addr__: { get_param: dcae_ip_addr } - __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } - __dcae_db_ip_addr__: { get_param: dcae_db_ip_addr } - __dcae_hdp1_ip_addr__: { get_param: dcae_hdp1_ip_addr } - __dcae_hdp2_ip_addr__: { get_param: dcae_hdp2_ip_addr } - __dcae_hdp3_ip_addr__: { get_param: dcae_hdp3_ip_addr } - __dcae_float_ip__: { get_param: dcae_float_ip } - __dcae_coll_float_ip__: { get_param: dcae_coll_float_ip } - __dcae_db_float_ip__: { get_param: dcae_db_float_ip } - __dcae_hdp1_float_ip__: { get_param: dcae_hdp1_float_ip } - __dcae_hdp2_float_ip__: { get_param: dcae_hdp2_float_ip } - __dcae_hdp3_float_ip__: { get_param: dcae_hdp3_float_ip } __external_dns__: { get_param: external_dns } - __ubuntu_1404_image__: { get_param: ubuntu_1404_image } - __ubuntu_1604_image__: { get_param: ubuntu_1604_image } - __flavor_small__: { get_param: flavor_small } - __flavor_medium__: { get_param: flavor_medium } - __flavor_large__: { get_param: flavor_large } - __flavor_xlarge__: { get_param: flavor_xlarge } - __dcae_repo__: { get_param: dcae_repo } - __mr_repo__: { get_param: mr_repo } + __policy_repo__: { get_param: policy_repo } template: | #!/bin/bash @@ -1302,86 +1439,49 @@ resources: echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt - echo "__nexus_url_snapshots__" > /opt/config/nexus_url_snapshots.txt - echo "__gitlab_branch__" > /opt/config/gitlab_branch.txt - echo "__docker_version__" > /opt/config/docker_version.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__public_ip__" > /opt/config/public_ip.txt + echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt - echo "__dcae_zone__" > /opt/config/dcae_zone.txt - echo "__dcae_state__" > /opt/config/dcae_state.txt - echo "__tenant_id__" > /opt/config/tenant_id.txt - echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt - echo "__openstack_user__" > /opt/config/openstack_user.txt - echo "__openstack_password__" > /opt/config/openstack_password.txt - echo "__openstack_auth_method__" > /opt/config/openstack_auth_method.txt - echo "__key_name__" > /opt/config/key_name.txt - echo "__rand_str__" > /opt/config/rand_str.txt - echo "__pub_key__" > /opt/config/pub_key.txt - echo "__nexus_repo_root__" > /opt/config/nexus_repo_root.txt - echo "__openstack_region__" > /opt/config/openstack_region.txt - echo "__horizon_url__" > /opt/config/horizon_url.txt - echo "__keystone_url__" > /opt/config/keystone_url.txt echo "__cloud_env__" > /opt/config/cloud_env.txt - echo "__public_net_id__" > /opt/config/public_net_id.txt - echo "__dcae_base_environment__" > /opt/config/dcae_base_environment.txt - echo "__dcae_code_version__" > /opt/config/dcae_code_version.txt - echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt - echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt - echo "__dcae_db_ip_addr__" > /opt/config/dcae_db_ip_addr.txt - echo "__dcae_hdp1_ip_addr__" > /opt/config/dcae_hdp1_ip_addr.txt - echo "__dcae_hdp2_ip_addr__" > /opt/config/dcae_hdp2_ip_addr.txt - echo "__dcae_hdp3_ip_addr__" > /opt/config/dcae_hdp3_ip_addr.txt - echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt - echo "__dcae_coll_float_ip__" > /opt/config/dcae_coll_float_ip.txt - echo "__dcae_db_float_ip__" > /opt/config/dcae_db_float_ip.txt - echo "__dcae_hdp1_float_ip__" > /opt/config/dcae_hdp1_float_ip.txt - echo "__dcae_hdp2_float_ip__" > /opt/config/dcae_hdp2_float_ip.txt - echo "__dcae_hdp3_float_ip__" > /opt/config/dcae_hdp3_float_ip.txt echo "__external_dns__" > /opt/config/external_dns.txt - echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt - echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt - echo "__flavor_small__" > /opt/config/flavor_small.txt - echo "__flavor_medium__" > /opt/config/flavor_medium.txt - echo "__flavor_large__" > /opt/config/flavor_large.txt - echo "__flavor_xlarge__" > /opt/config/flavor_xlarge.txt - echo "__dcae_repo__" > /opt/config/remote_repo.txt - echo "__mr_repo__" > /opt/config/mr_repo.txt + echo "__policy_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/policy_install.sh -o /opt/policy_install.sh cd /opt - chmod +x dcae_install.sh - ./dcae_install.sh + chmod +x policy_install.sh + ./policy_install.sh - # Policy Engine instantiation - policy_private_port: + # APP-C instantiation + appc_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } - fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: policy_ip_addr }}] + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: appc_ip_addr }}] - policy_floating_ip: + appc_floating_ip: type: OS::Neutron::FloatingIP properties: floating_network_id: { get_param: public_net_id } - port_id: { get_resource: policy_private_port } - floating_ip_address: { get_param: policy_float_ip } + port_id: { get_resource: appc_private_port } + floating_ip_address: { get_param: appc_float_ip } - policy_vm: + appc_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1404_image } - flavor: { get_param: flavor_xlarge } + flavor: { get_param: flavor_large } name: str_replace: - template: base-policy + template: base-appc params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - - port: { get_resource: policy_private_port } + - port: { get_resource: appc_private_port } user_data_format: RAW user_data: str_replace: @@ -1390,14 +1490,15 @@ resources: __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } + __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __public_ip__: { get_attr: [policy_floating_ip, floating_ip_address] } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: appc_docker } + __gerrit_branch__: { get_param: appc_branch } + __dgbuilder_docker__: { get_param: dgbuilder_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } - __policy_repo__: { get_param: policy_repo } + __appc_repo__: { get_param: appc_repo } template: | #!/bin/bash @@ -1409,47 +1510,48 @@ resources: echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt - echo "__public_ip__" > /opt/config/public_ip.txt + echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt - echo "__policy_repo__" > /opt/config/remote_repo.txt + echo "__appc_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/policy_install.sh -o /opt/policy_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh cd /opt - chmod +x policy_install.sh - ./policy_install.sh + chmod +x appc_install.sh + ./appc_install.sh - # APP-C instantiation - appc_private_port: + # CLAMP instantiation + clamp_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } - fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: appc_ip_addr }}] + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: clamp_ip_addr }}] - appc_floating_ip: + clamp_floating_ip: type: OS::Neutron::FloatingIP properties: floating_network_id: { get_param: public_net_id } - port_id: { get_resource: appc_private_port } - floating_ip_address: { get_param: appc_float_ip } + port_id: { get_resource: clamp_private_port } + floating_ip_address: { get_param: clamp_float_ip } - appc_vm: + clamp_vm: type: OS::Nova::Server properties: - image: { get_param: ubuntu_1404_image } - flavor: { get_param: flavor_large } + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_medium } name: - str_replace: - template: base-appc + str_replace: + template: base-clamp params: - base: { get_param: vm_base_name } + base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - - port: { get_resource: appc_private_port } + - port: { get_resource: clamp_private_port } user_data_format: RAW user_data: str_replace: @@ -1458,14 +1560,19 @@ resources: __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } + __openstack_username__: { get_param: openstack_username } + __openstack_tenant_id__: { get_param: openstack_tenant_id } + __openstack_api_key__: { get_param: openstack_api_key } + __openstack_region__: { get_param: openstack_region } + __keystone_url__: { get_param: keystone_url } __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: clamp_docker } + __gerrit_branch__: { get_param: clamp_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } - __appc_repo__: { get_param: appc_repo } + __clamp_repo__: { get_param: clamp_repo } template: | #!/bin/bash @@ -1478,14 +1585,231 @@ resources: echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt + echo "__openstack_username__" > /opt/config/openstack_username.txt + echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt + echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt + echo "__openstack_region__" > /opt/config/openstack_region.txt + echo "__keystone_url__" > /opt/config/keystone.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt - echo "__appc_repo__" > /opt/config/remote_repo.txt + echo "__clamp_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh cd /opt - chmod +x appc_install.sh - ./appc_install.sh
\ No newline at end of file + chmod +x clamp_install.sh + ./clamp_install.sh + + + # OPEN-O VM instantiation + openo_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: openo_ip_addr }}] + + openo_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: openo_private_port } + floating_ip_address: { get_param: openo_float_ip } + + openo_vm: + type: OS::Nova::Server + properties: + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_xxlarge } + name: + str_replace: + template: base-openo-server + params: + base: { get_param: vm_base_name } + key_name: { get_resource: vm_key } + networks: + - port: { get_resource: openo_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __artifacts_version__: { get_param: artifacts_version } + __dns_ip_addr__: { get_param: dns_ip_addr } + __oam_network_cidr__: { get_param: oam_network_cidr } + __aai1_ip_addr__: { get_param: aai1_ip_addr } + __aai2_ip_addr__: { get_param: aai2_ip_addr } + __appc_ip_addr__: { get_param: appc_ip_addr } + __dcae_ip_addr__: { get_param: dcae_ip_addr } + __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } + __mr_ip_addr__: { get_param: mr_ip_addr } + __policy_ip_addr__: { get_param: policy_ip_addr } + __portal_ip_addr__: { get_param: portal_ip_addr } + __robot_ip_addr__: { get_param: robot_ip_addr } + __sdc_ip_addr__: { get_param: sdc_ip_addr } + __sdnc_ip_addr__: { get_param: sdnc_ip_addr } + __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_ip_addr } + __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } + __vnfsdk_branch__: { get_param: vnfsdk_branch } + __msb_docker__: { get_param: msb_docker } + __mvim_docker__: { get_param: mvim_docker } + __vfc_docker__: { get_param: vfc_docker } + __uui_docker__: { get_param: uui_docker } + __esr_docker__: { get_param: esr_docker } + __vnfsdk_repo__: { get_param: vnfsdk_repo } + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt + echo "__nexus_username__" > /opt/config/nexus_username.txt + echo "__nexus_password__" > /opt/config/nexus_password.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt + echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__external_dns__" > /opt/config/external_dns.txt + echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt + echo "__msb_docker__" > /opt/config/msb_docker.txt + echo "__mvim_docker__" > /opt/config/mvim_docker.txt + echo "__vfc_docker__" > /opt/config/vfc_docker.txt + echo "__uui_docker__" > /opt/config/uui_docker.txt + echo "__esr_docker__" > /opt/config/esr_docker.txt + echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt + + # Create env file with the IP address of all ONAP components + echo "export AAI_IP1=__aai1_ip_addr__" >> /opt/config/onap_ips.txt + echo "export AAI_IP2=__aai2_ip_addr__" >> /opt/config/onap_ips.txt + echo "export APPC_IP=__appc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export DCAE_IP=__dcae_ip_addr__" >> /opt/config/onap_ips.txt + echo "export DCAE_COLL_IP=__dcae_coll_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SO_IP=__so_ip_addr__" >> /opt/config/onap_ips.txt + echo "export MR_IP=__mr_ip_addr__" >> /opt/config/onap_ips.txt + echo "export POLICY_IP=__policy_ip_addr__" >> /opt/config/onap_ips.txt + echo "export PORTAL_IP=__portal_ip_addr__" >> /opt/config/onap_ips.txt + echo "export ROBOT_IP=__robot_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SDC_IP=__sdc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SDNC_IP=__sdnc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export VID_IP=__vid_ip_addr__" >> /opt/config/onap_ips.txt + echo "export CLAMP_IP=__clamp_ip_addr__" >> /opt/config/onap_ips.txt + echo "export OPENO_IP=__openo_ip_addr__" >> /opt/config/onap_ips.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/openo_install.sh -o /opt/openo_install.sh + cd /opt + chmod +x openo_install.sh + ./openo_install.sh + + + # DCAE GEN 2 Controller instantiation + dcae_c_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}] + + dcae_c_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: dcae_c_private_port } + + dcae_c_vm: + type: OS::Nova::Server + properties: + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_medium } + name: + str_replace: + template: base-dcae-controller + params: + base: { get_param: vm_base_name } + key_name: { get_resource: dcae_vm_key } + networks: + - port: { get_resource: dcae_c_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __dns_ip_addr__: { get_param: dns_ip_addr } + __dcae_zone__: { get_param: dcae_zone } + __artifacts_version__: { get_param: artifacts_version } + __tenant_id__: { get_param: openstack_tenant_id } + __openstack_private_network_name__: { get_attr: [oam_onap, name] } + __openstack_user__: { get_param: openstack_username } + __openstack_password__: { get_param: openstack_api_key } + __key_name__: { get_param: dcae_key_name } + __pub_key__: { get_param: dcae_pub_key } + __private_key__: { get_attr: [ dcae_vm_key, private_key ] } + __openstack_region__: { get_param: openstack_region } + __keystone_url__: { get_param: keystone_url } + __docker_version__: { get_param: dcae_docker } + __dcae_repo__: { get_param: dcae_repo } + __gerrit_branch__: { get_param: dcae_branch } + __cloud_env__: { get_param: cloud_env } + __public_net_id__: { get_param: public_net_id } + __dcae_ip_addr__: { get_param: dcae_ip_addr } + __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } + __external_dns__: { get_param: external_dns } + __ubuntu_1604_image__: { get_param: ubuntu_1604_image } + __centos_7_image__: { get_param: centos_7_image } + __security_group__ : { get_param: security_group } + __flavor_medium__: { get_param: flavor_medium } + __mac_addr__: { get_attr: [dcae_c_private_port, mac_address] } + __rand_str__: { get_resource: random-str } + + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt + echo "__nexus_username__" > /opt/config/nexus_username.txt + echo "__nexus_password__" > /opt/config/nexus_password.txt + echo "__docker_version__" > /opt/config/docker_version.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dcae_zone__" > /opt/config/dcae_zone.txt + echo "__tenant_id__" > /opt/config/tenant_id.txt + echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt + echo "__openstack_user__" > /opt/config/openstack_user.txt + echo "__openstack_password__" > /opt/config/openstack_password.txt + echo "__key_name__" > /opt/config/key_name.txt + echo "__pub_key__" > /opt/config/pub_key.txt + echo "__private_key__" > /opt/config/priv_key + echo "__openstack_region__" > /opt/config/openstack_region.txt + echo "__keystone_url__" > /opt/config/keystone_url.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__public_net_id__" > /opt/config/public_net_id.txt + echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt + echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt + echo "__external_dns__" > /opt/config/external_dns.txt + echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt + echo "__centos_7_image__" > /opt/config/centos_7_image.txt + echo "__security_group__" > /opt/config/security_group.txt + echo "__flavor_medium__" > /opt/config/flavor_medium.txt + echo "__dcae_repo__" > /opt/config/remote_repo.txt + echo "__mac_addr__" > /opt/config/mac_addr.txt + echo "__rand_str__" > /opt/config/rand_str.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh + cd /opt + chmod +x dcae2_install.sh + ./dcae2_install.sh
\ No newline at end of file diff --git a/heat/ONAP/onap_openstack_nofloat.env b/heat/ONAP/onap_openstack_nofloat.env index 0987d580..1b9cbd91 100644 --- a/heat/ONAP/onap_openstack_nofloat.env +++ b/heat/ONAP/onap_openstack_nofloat.env @@ -12,6 +12,8 @@ parameters: ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE + centos_7_image: PUT THE CENTOS 7 IMAGE NAME HERE + flavor_small: PUT THE SMALL FLAVOR NAME HERE flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE @@ -20,12 +22,20 @@ parameters: flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE + flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE + + security_group: PUT THE NAME OF THE SECURITY GROUP HERE + vm_base_name: vm1 key_name: onap_key + dcae_key_name: dcae_key + pub_key: PUT YOUR PUBLIC KEY HERE + dcae_pub_key: PUT YOUR DCAE PUBLIC KEY HERE + nexus_repo: https://nexus.onap.org/content/sites/raw nexus_docker_repo: nexus3.onap.org:10001 @@ -38,10 +48,6 @@ parameters: artifacts_version: 1.1.0-SNAPSHOT - docker_version: 1.1-STAGING-latest - - gerrit_branch: master - openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE openstack_username: PUT YOUR OPENSTACK USERNAME HERE @@ -54,7 +60,7 @@ parameters: horizon_url: PUT THE HORIZON URL HERE - keystone_url: PUT THE KEYSTONE URL HERE + keystone_url: PUT THE KEYSTONE URL HERE (do not include version number) cloud_env: openstack_nofloat @@ -66,8 +72,10 @@ parameters: ###################### external_dns: PUT THE ADDRESS OF THE EXTERNAL DNS HERE - oam_network_cidr: 10.0.0.0/16 + + ### Private IP addresses ### + aai1_ip_addr: 10.0.1.1 aai2_ip_addr: 10.0.1.2 appc_ip_addr: 10.0.2.1 @@ -78,7 +86,7 @@ parameters: dcae_hdp2_ip_addr: 10.0.4.104 dcae_hdp3_ip_addr: 10.0.4.105 dns_ip_addr: 10.0.100.1 - mso_ip_addr: 10.0.5.1 + so_ip_addr: 10.0.5.1 mr_ip_addr: 10.0.11.1 policy_ip_addr: 10.0.6.1 portal_ip_addr: 10.0.9.1 @@ -86,7 +94,8 @@ parameters: sdc_ip_addr: 10.0.3.1 sdnc_ip_addr: 10.0.7.1 vid_ip_addr: 10.0.8.1 - + clamp_ip_addr: 10.0.12.1 + openo_ip_addr: 10.0.14.1 ########################### # # @@ -109,6 +118,46 @@ parameters: dcae_code_version: 1.1.0 + ################################ + # # + # Docker versions and branches # + # # + ################################ + + aai_branch: master + appc_branch: master + so_branch: master + mr_branch: master + dcae_branch: master + policy_branch: master + portal_branch: master + robot_branch: master + sdc_branch: master + sdnc_branch: master + vid_branch: master + clamp_branch: master + vnfsdk_branch: master + + aai_docker: 1.1-STAGING-latest + appc_docker: 1.1-STAGING-latest + so_docker: 1.1-STAGING-latest + mr_docker: 1.1-STAGING-latest + dcae_docker: 1.1-latest + policy_docker: 1.1-STAGING-latest + portal_docker: 1.3-STAGING-latest + robot_docker: 1.1-STAGING-latest + sdc_docker: 1.1-STAGING-latest + sdnc_docker: 1.2-STAGING-latest + vid_docker: 1.1-STAGING-latest + clamp_docker: 1.1-STAGING-latest + msb_docker: latest + mvim_docker: latest + vfc_docker: latest + uui_docker: latest + esr_docker: latest + dgbuilder_docker: 0.1-STAGING-latest + cli_docker: 1.1-STAGING-latest + ##################### # # # ONAP repositories # @@ -118,10 +167,12 @@ parameters: appc_repo: http://gerrit.onap.org/r/appc/deployment.git dcae_repo: http://gerrit.onap.org/r/dcae/demo/startup/controller.git mr_repo: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git - mso_repo: http://gerrit.onap.org/r/so/docker-config.git + so_repo: http://gerrit.onap.org/r/so/docker-config.git policy_repo: http://gerrit.onap.org/r/policy/docker.git portal_repo: http://gerrit.onap.org/r/portal.git robot_repo: http://gerrit.onap.org/r/testsuite/properties.git sdc_repo: http://gerrit.onap.org/r/sdc.git sdnc_repo: http://gerrit.onap.org/r/sdnc/oam.git vid_repo: http://gerrit.onap.org/r/vid.git + clamp_repo: http://gerrit.onap.org/r/clamp.git + vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git diff --git a/heat/ONAP/onap_openstack_nofloat.yaml b/heat/ONAP/onap_openstack_nofloat.yaml index 59b97026..3ebd37ec 100644 --- a/heat/ONAP/onap_openstack_nofloat.yaml +++ b/heat/ONAP/onap_openstack_nofloat.yaml @@ -52,6 +52,10 @@ parameters: type: string description: Name of the Ubuntu 16.04 image + centos_7_image: + type: string + description: Name of the CentOS 7 image + flavor_small: type: string description: Name of the Small Flavor supported by the cloud provider @@ -68,6 +72,14 @@ parameters: type: string description: Name of the Extra Large Flavor supported by the cloud provider + flavor_xxlarge: + type: string + description: Name of the Extra Extra Large Flavor supported by the cloud provider + + security_group: + type: string + description: Security group used by DCAE GEN 2 + vm_base_name: type: string description: Base name of ONAP VMs @@ -76,10 +88,18 @@ parameters: type: string description: Public/Private key pair name + dcae_key_name: + type: string + description: Public/Private key pair name for DCAE GEN 2 + pub_key: type: string description: Public key to be installed on the compute instance + dcae_pub_key: + type: string + description: Public key to be installed on the DCAE GEN 2 compute instance + nexus_repo: type: string description: Complete URL for the Nexus repository. @@ -100,15 +120,6 @@ parameters: type: string description: Artifacts version of ONAP components - docker_version: - type: string - label: Version number of ONAP docker images - - gerrit_branch: - type: string - label: Gerrit code branch - description: Gerrit branch where to download the code from - dmaap_topic: type: string description: DMaaP Topic name @@ -127,7 +138,7 @@ parameters: openstack_api_key: type: string - description: Openstack API Key + description: Openstack password or API Key horizon_url: type: string @@ -151,83 +162,52 @@ parameters: type: string description: External DNS for OAM ONAP network - ### Private IP addresses ### oam_network_cidr: type: string description: CIDR of the OAM ONAP network + ### Private IP addresses ### + aai1_ip_addr: type: string - description: AAI Instance 1 IP Address - aai2_ip_addr: type: string - description: AAI Instance 2 IP Address - appc_ip_addr: type: string - description: APP-C IP Address - dcae_ip_addr: type: string - description: DCAE IP Address - dcae_coll_ip_addr: type: string - description: DCAE Collector IP Address - dcae_db_ip_addr: type: string - description: DCAE Database IP Address - dcae_hdp1_ip_addr: type: string - description: Hadoop VM1 IP Address - dcae_hdp2_ip_addr: type: string - description: Hadoop VM2 IP Address - dcae_hdp3_ip_addr: type: string - description: Hadoop VM3 IP Address - dns_ip_addr: type: string - description: DNS IP Address - - mso_ip_addr: + so_ip_addr: type: string - description: MSO IP Address - mr_ip_addr: type: string - description: Message Router IP Address - policy_ip_addr: type: string - description: Policy Engine IP Address - portal_ip_addr: type: string - description: Portal IP Address - robot_ip_addr: type: string - description: Robot Framework IP Address - sdc_ip_addr: type: string - description: SDC IP Address - sdnc_ip_addr: type: string - description: SDN-C IP Address - vid_ip_addr: type: string - description: VID IP Address - + clamp_ip_addr: + type: string + openo_ip_addr: + type: string ########################### # # @@ -275,47 +255,102 @@ parameters: aai_repo: type: string - description: AAI repository - appc_repo: type: string - description: APPC repository - dcae_repo: type: string - description: DCAE repository - mr_repo: type: string - description: Message Router repository - - mso_repo: + so_repo: type: string - description: MSO repository - policy_repo: type: string - description: Policy repository - portal_repo: type: string - description: Portal repository - robot_repo: type: string - description: Robot repository - sdc_repo: type: string - description: SDC repository - sdnc_repo: type: string - description: SDNC repository - vid_repo: type: string - description: VID repository + clamp_repo: + type: string + vnfsdk_repo: + type: string + + ################################ + # # + # Docker versions and branches # + # # + ################################ + + aai_docker: + type: string + appc_docker: + type: string + so_docker: + type: string + mr_docker: + type: string + dcae_docker: + type: string + policy_docker: + type: string + portal_docker: + type: string + robot_docker: + type: string + sdc_docker: + type: string + sdnc_docker: + type: string + vid_docker: + type: string + clamp_docker: + type: string + msb_docker: + type: string + mvim_docker: + type: string + vfc_docker: + type: string + uui_docker: + type: string + esr_docker: + type: string + dgbuilder_docker: + type: string + cli_docker: + type: string + + aai_branch: + type: string + appc_branch: + type: string + so_branch: + type: string + mr_branch: + type: string + dcae_branch: + type: string + policy_branch: + type: string + portal_branch: + type: string + robot_branch: + type: string + sdc_branch: + type: string + sdnc_branch: + type: string + vid_branch: + type: string + clamp_branch: + type: string + vnfsdk_branch: + type: string ############# @@ -344,6 +379,18 @@ resources: public_key: { get_param: pub_key } save_private_key: false + # Public key used to access DCAE GEN 2 + dcae_vm_key: + type: OS::Nova::KeyPair + properties: + name: + str_replace: + template: base_rand + params: + base: { get_param: dcae_key_name } + rand: { get_resource: random-str } + public_key: { get_param: dcae_pub_key } + save_private_key: true # ONAP management private network oam_onap: @@ -401,7 +448,7 @@ resources: __appc_ip_addr__: { get_param: appc_ip_addr } __dcae_ip_addr__: { get_param: dcae_ip_addr } __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } - __mso_ip_addr__: { get_param: mso_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } __portal_ip_addr__: { get_param: portal_ip_addr } @@ -409,6 +456,8 @@ resources: __sdc_ip_addr__: { get_param: sdc_ip_addr } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_ip_addr } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } template: | @@ -426,7 +475,7 @@ resources: echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt - echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt @@ -434,6 +483,8 @@ resources: echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt + echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script @@ -478,8 +529,8 @@ resources: __dns_ip_addr__: { get_param: dns_ip_addr } __aai_ip_addr__: { get_param: aai1_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: aai_docker } + __gerrit_branch__: { get_param: aai_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __aai_repo__: { get_param: aai_repo } @@ -544,8 +595,8 @@ resources: __dns_ip_addr__: { get_param: dns_ip_addr } __aai_ip_addr__: { get_param: aai2_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: aai_docker } + __gerrit_branch__: { get_param: aai_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __aai_repo__: { get_param: aai_repo } @@ -577,27 +628,27 @@ resources: ./aai_install.sh - # MSO instantiation - mso_private_port: + # SO instantiation + so_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } - fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: mso_ip_addr }}] + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: so_ip_addr }}] - mso_vm: + so_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } flavor: { get_param: flavor_large } name: str_replace: - template: base-mso + template: base-so params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - network: { get_param: public_net_id } - - port: { get_resource: mso_private_port } + - port: { get_resource: so_private_port } user_data_format: RAW user_data: str_replace: @@ -614,13 +665,13 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __mso_ip_addr__: { get_param: mso_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: so_docker } + __gerrit_branch__: { get_param: so_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } - __mso_repo__: { get_param: mso_repo } + __so_repo__: { get_param: so_repo } template: | #!/bin/bash @@ -631,7 +682,7 @@ resources: echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt - echo "__mso_ip_addr__" > /opt/config/local_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/local_ip_addr.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt @@ -644,13 +695,13 @@ resources: echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt - echo "__mso_repo__" > /opt/config/remote_repo.txt + echo "__so_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mso_install.sh -o /opt/mso_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/so_install.sh -o /opt/so_install.sh cd /opt - chmod +x mso_install.sh - ./mso_install.sh + chmod +x so_install.sh + ./so_install.sh # Message Router instantiation @@ -686,7 +737,7 @@ resources: __mr_ip_addr__: { get_param: mr_ip_addr } __dns_ip_addr__: { get_param: dns_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __gerrit_branch__: { get_param: gerrit_branch } + __gerrit_branch__: { get_param: mr_gerrit } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __mr_repo__: { get_param: mr_repo } @@ -726,7 +777,7 @@ resources: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } - flavor: { get_param: flavor_small } + flavor: { get_param: flavor_medium } name: str_replace: template: base-robot @@ -747,25 +798,28 @@ resources: __network_name__: { get_attr: [oam_onap, name] } __openstack_username__: { get_param: openstack_username } __openstack_api_key__: { get_param : openstack_api_key } + __openstack_tenant_id__: { get_param: openstack_tenant_id } __artifacts_version__: { get_param: artifacts_version } __openstack_region__: { get_param: openstack_region } __robot_ip_addr__: { get_param: robot_ip_addr } __dns_ip_addr__: { get_param: dns_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: robot_docker } + __gerrit_branch__: { get_param: robot_branch } __keystone_url__: { get_param: keystone_url } __aai1_ip_addr__: { get_param: aai1_ip_addr } __aai2_ip_addr__: { get_param: aai2_ip_addr } __appc_ip_addr__: { get_param: appc_ip_addr } __dcae_ip_addr__: { get_param: dcae_ip_addr } - __mso_ip_addr__: { get_param: mso_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } __portal_ip_addr__: { get_param: portal_ip_addr } __sdc_ip_addr__: { get_param: sdc_ip_addr } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_ip_addr } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __vm_image_name__: { get_param: ubuntu_1404_image } @@ -783,6 +837,7 @@ resources: echo "__network_name__" > /opt/config/network.txt echo "__openstack_username__" > /opt/config/openstack_username.txt echo "__openstack_api_key__" > /opt/config/openstack_password.txt + echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt echo "__openstack_region__" > /opt/config/region.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__robot_ip_addr__" > /opt/config/local_ip_addr.txt @@ -795,13 +850,15 @@ resources: echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt - echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt + echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__vm_image_name__" > /opt/config/vm_image_name.txt @@ -848,8 +905,8 @@ resources: __vid_ip_addr__: { get_param: vid_ip_addr } __dns_ip_addr__: { get_param: dns_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: vid_docker } + __gerrit_branch__: { get_param: vid_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __vid_repo__: { get_param: vid_repo } @@ -912,8 +969,9 @@ resources: __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __dns_ip_addr__: { get_param: dns_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: sdnc_docker } + __gerrit_branch__: { get_param: sdnc_branch } + __dgbuilder_docker__: { get_param: dgbuilder_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __sdnc_repo__: { get_param: sdnc_repo } @@ -932,6 +990,7 @@ resources: echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__sdnc_repo__" > /opt/config/remote_repo.txt @@ -987,8 +1046,8 @@ resources: __dns_ip_addr__: { get_param: dns_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } __mr_ip_addr__: { get_param: mr_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: sdc_docker } + __gerrit_branch__: { get_param: sdc_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __sdc_repo__: { get_param: sdc_repo } @@ -1014,10 +1073,10 @@ resources: echo "__sdc_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/asdc_install.sh -o /opt/asdc_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdc_install.sh -o /opt/sdc_install.sh cd /opt - chmod +x asdc_install.sh - ./asdc_install.sh + chmod +x sdc_install.sh + ./sdc_install.sh # PORTAL instantiation @@ -1053,9 +1112,10 @@ resources: __portal_ip_addr__: { get_param: portal_ip_addr } __dns_ip_addr__: { get_param: dns_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: portal_docker } + __gerrit_branch__: { get_param: portal_branch } __cloud_env__: { get_param: cloud_env } + __cli_docker__: { get_param: cli_docker } __external_dns__: { get_param: external_dns } __portal_repo__: { get_param: portal_repo } template: | @@ -1073,6 +1133,7 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__cli_docker__" > /opt/config/cli_docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__portal_repo__" > /opt/config/remote_repo.txt @@ -1085,26 +1146,152 @@ resources: # DCAE Controller instantiation - dcae_c_private_port: +# dcae_c_private_port: +# type: OS::Neutron::Port +# properties: +# network: { get_resource: oam_onap } +# fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}] + +# dcae_c_vm: +# type: OS::Nova::Server +# properties: +# image: { get_param: ubuntu_1404_image } +# flavor: { get_param: flavor_medium } +# name: +# str_replace: +# template: base-dcae-controller +# params: +# base: { get_param: vm_base_name } +# key_name: { get_resource: vm_key } +# networks: +# - network: { get_param: public_net_id } +# - port: { get_resource: dcae_c_private_port } +# user_data_format: RAW +# user_data: +# str_replace: +# params: +# __nexus_repo__: { get_param: nexus_repo } +# __nexus_docker_repo__: { get_param: nexus_docker_repo } +# __nexus_username__: { get_param: nexus_username } +# __nexus_password__: { get_param: nexus_password } +# __nexus_url_snapshots__: { get_param: nexus_url_snapshot } +# __gitlab_branch__: { get_param: gitlab_branch } +# __dns_ip_addr__: { get_param: dns_ip_addr } +# __oam_network_cidr__: { get_param: oam_network_cidr } +# __dcae_zone__: { get_param: dcae_zone } +# __dcae_state__: { get_param: dcae_state } +# __artifacts_version__: { get_param: artifacts_version } +# __tenant_id__: { get_param: openstack_tenant_id } +# __openstack_private_network_name__: { get_attr: [oam_onap, name] } +# __openstack_user__: { get_param: openstack_username } +# __openstack_password__: { get_param: openstack_api_key } +# __openstack_auth_method__: { get_param: openstack_auth_method } +# __key_name__: { get_param: key_name } +# __rand_str__: { get_resource: random-str } +# __pub_key__: { get_param: pub_key } +# __nexus_repo_root__: { get_param: nexus_repo_root } +# __openstack_region__: { get_param: openstack_region } +# __horizon_url__: { get_param: horizon_url } +# __keystone_url__: { get_param: keystone_url } +# __docker_version__: { get_param: dcae_docker } +# __gerrit_branch__: { get_param: dcae_branch } +# __dcae_code_version__: { get_param: dcae_code_version } +# __cloud_env__: { get_param: cloud_env } +# __public_net_id__: { get_param: public_net_id } +# __dcae_base_environment__: { get_param: dcae_base_environment } +# __dcae_ip_addr__: { get_param: dcae_ip_addr } +# __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } +# __dcae_db_ip_addr__: { get_param: dcae_db_ip_addr } +# __dcae_hdp1_ip_addr__: { get_param: dcae_hdp1_ip_addr } +# __dcae_hdp2_ip_addr__: { get_param: dcae_hdp2_ip_addr } +# __dcae_hdp3_ip_addr__: { get_param: dcae_hdp3_ip_addr } +# __external_dns__: { get_param: external_dns } +# __ubuntu_1404_image__: { get_param: ubuntu_1404_image } +# __ubuntu_1604_image__: { get_param: ubuntu_1604_image } +# __flavor_small__: { get_param: flavor_small } +# __flavor_medium__: { get_param: flavor_medium } +# __flavor_large__: { get_param: flavor_large } +# __flavor_xlarge__: { get_param: flavor_xlarge } +# __dcae_repo__: { get_param: dcae_repo } +# __mr_repo__: { get_param: mr_repo } +# template: | + #!/bin/bash + + # Create configuration files +# mkdir -p /opt/config +# echo "__nexus_repo__" > /opt/config/nexus_repo.txt +# echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt +# echo "__nexus_username__" > /opt/config/nexus_username.txt +# echo "__nexus_password__" > /opt/config/nexus_password.txt +# echo "__nexus_url_snapshots__" > /opt/config/nexus_url_snapshots.txt +# echo "__gitlab_branch__" > /opt/config/gitlab_branch.txt +# echo "__docker_version__" > /opt/config/docker_version.txt +# echo "__artifacts_version__" > /opt/config/artifacts_version.txt +# echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt +# echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt +# echo "__dcae_zone__" > /opt/config/dcae_zone.txt +# echo "__dcae_state__" > /opt/config/dcae_state.txt +# echo "__tenant_id__" > /opt/config/tenant_id.txt +# echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt +# echo "__openstack_user__" > /opt/config/openstack_user.txt +# echo "__openstack_password__" > /opt/config/openstack_password.txt +# echo "__openstack_auth_method__" > /opt/config/openstack_auth_method.txt +# echo "__key_name__" > /opt/config/key_name.txt +# echo "__rand_str__" > /opt/config/rand_str.txt +# echo "__pub_key__" > /opt/config/pub_key.txt +# echo "__nexus_repo_root__" > /opt/config/nexus_repo_root.txt +# echo "__openstack_region__" > /opt/config/openstack_region.txt +# echo "__horizon_url__" > /opt/config/horizon_url.txt +# echo "__keystone_url__" > /opt/config/keystone_url.txt +# echo "__cloud_env__" > /opt/config/cloud_env.txt +# echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt +# echo "__public_net_id__" > /opt/config/public_net_id.txt +# echo "__dcae_base_environment__" > /opt/config/dcae_base_environment.txt +# echo "__dcae_code_version__" > /opt/config/dcae_code_version.txt +# echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt +# echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt +# echo "__dcae_db_ip_addr__" > /opt/config/dcae_db_ip_addr.txt +# echo "__dcae_hdp1_ip_addr__" > /opt/config/dcae_hdp1_ip_addr.txt +# echo "__dcae_hdp2_ip_addr__" > /opt/config/dcae_hdp2_ip_addr.txt +# echo "__dcae_hdp3_ip_addr__" > /opt/config/dcae_hdp3_ip_addr.txt +# echo "__external_dns__" > /opt/config/external_dns.txt +# echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt +# echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt +# echo "__flavor_small__" > /opt/config/flavor_small.txt +# echo "__flavor_medium__" > /opt/config/flavor_medium.txt +# echo "__flavor_large__" > /opt/config/flavor_large.txt +# echo "__flavor_xlarge__" > /opt/config/flavor_xlarge.txt +# echo "__dcae_repo__" > /opt/config/remote_repo.txt +# echo "__mr_repo__" > /opt/config/mr_repo.txt + + # Download and run install script +# curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh +# cd /opt +# chmod +x dcae_install.sh +# ./dcae_install.sh + + + # Policy Engine instantiation + policy_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } - fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}] + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: policy_ip_addr }}] - dcae_c_vm: + policy_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1404_image } - flavor: { get_param: flavor_medium } + flavor: { get_param: flavor_xlarge } name: str_replace: - template: base-dcae-controller + template: base-policy params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - network: { get_param: public_net_id } - - port: { get_resource: dcae_c_private_port } + - port: { get_resource: policy_private_port } user_data_format: RAW user_data: str_replace: @@ -1113,46 +1300,15 @@ resources: __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } - __nexus_url_snapshots__: { get_param: nexus_url_snapshot } - __gitlab_branch__: { get_param: gitlab_branch } + __artifacts_version__: { get_param: artifacts_version } + __policy_ip_addr__: { get_param: policy_ip_addr } __dns_ip_addr__: { get_param: dns_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __dcae_zone__: { get_param: dcae_zone } - __dcae_state__: { get_param: dcae_state } - __artifacts_version__: { get_param: artifacts_version } - __tenant_id__: { get_param: openstack_tenant_id } - __openstack_private_network_name__: { get_attr: [oam_onap, name] } - __openstack_user__: { get_param: openstack_username } - __openstack_password__: { get_param: openstack_api_key } - __openstack_auth_method__: { get_param: openstack_auth_method } - __key_name__: { get_param: key_name } - __rand_str__: { get_resource: random-str } - __pub_key__: { get_param: pub_key } - __nexus_repo_root__: { get_param: nexus_repo_root } - __openstack_region__: { get_param: openstack_region } - __horizon_url__: { get_param: horizon_url } - __keystone_url__: { get_param: keystone_url } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } - __dcae_code_version__: { get_param: dcae_code_version } + __docker_version__: { get_param: policy_docker } + __gerrit_branch__: { get_param: policy_branch } __cloud_env__: { get_param: cloud_env } - __public_net_id__: { get_param: public_net_id } - __dcae_base_environment__: { get_param: dcae_base_environment } - __dcae_ip_addr__: { get_param: dcae_ip_addr } - __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } - __dcae_db_ip_addr__: { get_param: dcae_db_ip_addr } - __dcae_hdp1_ip_addr__: { get_param: dcae_hdp1_ip_addr } - __dcae_hdp2_ip_addr__: { get_param: dcae_hdp2_ip_addr } - __dcae_hdp3_ip_addr__: { get_param: dcae_hdp3_ip_addr } __external_dns__: { get_param: external_dns } - __ubuntu_1404_image__: { get_param: ubuntu_1404_image } - __ubuntu_1604_image__: { get_param: ubuntu_1604_image } - __flavor_small__: { get_param: flavor_small } - __flavor_medium__: { get_param: flavor_medium } - __flavor_large__: { get_param: flavor_large } - __flavor_xlarge__: { get_param: flavor_xlarge } - __dcae_repo__: { get_param: dcae_repo } - __mr_repo__: { get_param: mr_repo } + __policy_repo__: { get_param: policy_repo } template: | #!/bin/bash @@ -1162,75 +1318,44 @@ resources: echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt - echo "__nexus_url_snapshots__" > /opt/config/nexus_url_snapshots.txt - echo "__gitlab_branch__" > /opt/config/gitlab_branch.txt - echo "__docker_version__" > /opt/config/docker_version.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__policy_ip_addr__" > /opt/config/local_ip_addr.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt + echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt - echo "__dcae_zone__" > /opt/config/dcae_zone.txt - echo "__dcae_state__" > /opt/config/dcae_state.txt - echo "__tenant_id__" > /opt/config/tenant_id.txt - echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt - echo "__openstack_user__" > /opt/config/openstack_user.txt - echo "__openstack_password__" > /opt/config/openstack_password.txt - echo "__openstack_auth_method__" > /opt/config/openstack_auth_method.txt - echo "__key_name__" > /opt/config/key_name.txt - echo "__rand_str__" > /opt/config/rand_str.txt - echo "__pub_key__" > /opt/config/pub_key.txt - echo "__nexus_repo_root__" > /opt/config/nexus_repo_root.txt - echo "__openstack_region__" > /opt/config/openstack_region.txt - echo "__horizon_url__" > /opt/config/horizon_url.txt - echo "__keystone_url__" > /opt/config/keystone_url.txt echo "__cloud_env__" > /opt/config/cloud_env.txt - echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt - echo "__public_net_id__" > /opt/config/public_net_id.txt - echo "__dcae_base_environment__" > /opt/config/dcae_base_environment.txt - echo "__dcae_code_version__" > /opt/config/dcae_code_version.txt - echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt - echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt - echo "__dcae_db_ip_addr__" > /opt/config/dcae_db_ip_addr.txt - echo "__dcae_hdp1_ip_addr__" > /opt/config/dcae_hdp1_ip_addr.txt - echo "__dcae_hdp2_ip_addr__" > /opt/config/dcae_hdp2_ip_addr.txt - echo "__dcae_hdp3_ip_addr__" > /opt/config/dcae_hdp3_ip_addr.txt echo "__external_dns__" > /opt/config/external_dns.txt - echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt - echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt - echo "__flavor_small__" > /opt/config/flavor_small.txt - echo "__flavor_medium__" > /opt/config/flavor_medium.txt - echo "__flavor_large__" > /opt/config/flavor_large.txt - echo "__flavor_xlarge__" > /opt/config/flavor_xlarge.txt - echo "__dcae_repo__" > /opt/config/remote_repo.txt - echo "__mr_repo__" > /opt/config/mr_repo.txt + echo "__policy_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/policy_install.sh -o /opt/policy_install.sh cd /opt - chmod +x dcae_install.sh - ./dcae_install.sh + chmod +x policy_install.sh + ./policy_install.sh - # Policy Engine instantiation - policy_private_port: + # APP-C instantiation + appc_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } - fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: policy_ip_addr }}] + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: appc_ip_addr }}] - policy_vm: + appc_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1404_image } - flavor: { get_param: flavor_xlarge } + flavor: { get_param: flavor_large } name: str_replace: - template: base-policy + template: base-appc params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - network: { get_param: public_net_id } - - port: { get_resource: policy_private_port } + - port: { get_resource: appc_private_port } user_data_format: RAW user_data: str_replace: @@ -1239,15 +1364,17 @@ resources: __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } + __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } - __policy_ip_addr__: { get_param: policy_ip_addr } + __appc_ip_addr__: { get_param: appc_ip_addr } __dns_ip_addr__: { get_param: dns_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: appc_docker } + __gerrit_branch__: { get_param: appc_branch } + __dgbuilder_docker__: { get_param: dgbuilder_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } - __policy_repo__: { get_param: policy_repo } + __appc_repo__: { get_param: appc_repo } template: | #!/bin/bash @@ -1258,43 +1385,45 @@ resources: echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt - echo "__policy_ip_addr__" > /opt/config/local_ip_addr.txt + echo "__appc_ip_addr__" > /opt/config/local_ip_addr.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt + echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt - echo "__policy_repo__" > /opt/config/remote_repo.txt + echo "__appc_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/policy_install.sh -o /opt/policy_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh cd /opt - chmod +x policy_install.sh - ./policy_install.sh + chmod +x appc_install.sh + ./appc_install.sh - # APP-C instantiation - appc_private_port: + # CLAMP instantiation + clamp_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } - fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: appc_ip_addr }}] + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: clamp_ip_addr }}] - appc_vm: + clamp_vm: type: OS::Nova::Server properties: - image: { get_param: ubuntu_1404_image } - flavor: { get_param: flavor_large } + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_medium } name: - str_replace: - template: base-appc + str_replace: + template: base-clamp params: - base: { get_param: vm_base_name } + base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - network: { get_param: public_net_id } - - port: { get_resource: appc_private_port } + - port: { get_resource: clamp_private_port } user_data_format: RAW user_data: str_replace: @@ -1303,16 +1432,21 @@ resources: __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } + __openstack_username__: { get_param: openstack_username } + __openstack_tenant_id__: { get_param: openstack_tenant_id } + __openstack_api_key__: { get_param: openstack_api_key } + __openstack_region__: { get_param: openstack_region } + __keystone_url__: { get_param: keystone_url } __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } - __appc_ip_addr__: { get_param: appc_ip_addr } __dns_ip_addr__: { get_param: dns_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: clamp_docker } + __gerrit_branch__: { get_param: clamp_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } - __appc_repo__: { get_param: appc_repo } + __clamp_repo__: { get_param: clamp_repo } template: | #!/bin/bash @@ -1323,18 +1457,224 @@ resources: echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt - echo "__appc_ip_addr__" > /opt/config/local_ip_addr.txt + echo "__clamp_ip_addr__" > /opt/config/local_ip_addr.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt + echo "__openstack_username__" > /opt/config/openstack_username.txt + echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt + echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt + echo "__openstack_region__" > /opt/config/openstack_region.txt + echo "__keystone_url__" > /opt/config/keystone.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt - echo "__appc_repo__" > /opt/config/remote_repo.txt + echo "__clamp_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh cd /opt - chmod +x appc_install.sh - ./appc_install.sh
\ No newline at end of file + chmod +x clamp_install.sh + ./clamp_install.sh + + + # OPEN-O VM instantiation + openo_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: openo_ip_addr }}] + + openo_vm: + type: OS::Nova::Server + properties: + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_xxlarge } + name: + str_replace: + template: base-openo-server + params: + base: { get_param: vm_base_name } + key_name: { get_resource: vm_key } + networks: + - network: { get_param: public_net_id } + - port: { get_resource: openo_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __artifacts_version__: { get_param: artifacts_version } + __dns_ip_addr__: { get_param: dns_ip_addr } + __oam_network_cidr__: { get_param: oam_network_cidr } + __aai1_ip_addr__: { get_param: aai1_ip_addr } + __aai2_ip_addr__: { get_param: aai2_ip_addr } + __appc_ip_addr__: { get_param: appc_ip_addr } + __dcae_ip_addr__: { get_param: dcae_ip_addr } + __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } + __mr_ip_addr__: { get_param: mr_ip_addr } + __policy_ip_addr__: { get_param: policy_ip_addr } + __portal_ip_addr__: { get_param: portal_ip_addr } + __robot_ip_addr__: { get_param: robot_ip_addr } + __sdc_ip_addr__: { get_param: sdc_ip_addr } + __sdnc_ip_addr__: { get_param: sdnc_ip_addr } + __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_ip_addr } + __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } + __vnfsdk_branch__: { get_param: vnfsdk_branch } + __msb_docker__: { get_param: msb_docker } + __mvim_docker__: { get_param: mvim_docker } + __vfc_docker__: { get_param: vfc_docker } + __uui_docker__: { get_param: uui_docker } + __esr_docker__: { get_param: esr_docker } + __vnfsdk_repo__: { get_param: vnfsdk_repo } + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt + echo "__nexus_username__" > /opt/config/nexus_username.txt + echo "__nexus_password__" > /opt/config/nexus_password.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt + echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__external_dns__" > /opt/config/external_dns.txt + echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt + echo "__msb_docker__" > /opt/config/msb_docker.txt + echo "__mvim_docker__" > /opt/config/mvim_docker.txt + echo "__vfc_docker__" > /opt/config/vfc_docker.txt + echo "__uui_docker__" > /opt/config/uui_docker.txt + echo "__esr_docker__" > /opt/config/esr_docker.txt + echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt + + # Create env file with the IP address of all ONAP components + echo "export AAI_IP1=__aai1_ip_addr__" >> /opt/config/onap_ips.txt + echo "export AAI_IP2=__aai2_ip_addr__" >> /opt/config/onap_ips.txt + echo "export APPC_IP=__appc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export DCAE_IP=__dcae_ip_addr__" >> /opt/config/onap_ips.txt + echo "export DCAE_COLL_IP=__dcae_coll_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SO_IP=__so_ip_addr__" >> /opt/config/onap_ips.txt + echo "export MR_IP=__mr_ip_addr__" >> /opt/config/onap_ips.txt + echo "export POLICY_IP=__policy_ip_addr__" >> /opt/config/onap_ips.txt + echo "export PORTAL_IP=__portal_ip_addr__" >> /opt/config/onap_ips.txt + echo "export ROBOT_IP=__robot_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SDC_IP=__sdc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SDNC_IP=__sdnc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export VID_IP=__vid_ip_addr__" >> /opt/config/onap_ips.txt + echo "export CLAMP_IP=__clamp_ip_addr__" >> /opt/config/onap_ips.txt + echo "export OPENO_IP=__openo_ip_addr__" >> /opt/config/onap_ips.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/openo_install.sh -o /opt/openo_install.sh + cd /opt + chmod +x openo_install.sh + ./openo_install.sh + + + # DCAE GEN 2 Controller instantiation + dcae_c_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}] + + dcae_c_vm: + type: OS::Nova::Server + properties: + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_medium } + name: + str_replace: + template: base-dcae-controller + params: + base: { get_param: vm_base_name } + key_name: { get_resource: dcae_vm_key } + networks: + - network: { get_param: public_net_id } + - port: { get_resource: dcae_c_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __dns_ip_addr__: { get_param: dns_ip_addr } + __dcae_zone__: { get_param: dcae_zone } + __artifacts_version__: { get_param: artifacts_version } + __tenant_id__: { get_param: openstack_tenant_id } + __openstack_private_network_name__: { get_attr: [oam_onap, name] } + __openstack_user__: { get_param: openstack_username } + __openstack_password__: { get_param: openstack_api_key } + __key_name__: { get_param: dcae_key_name } + __pub_key__: { get_param: dcae_pub_key } + __private_key__: { get_attr: [ dcae_vm_key, private_key ] } + __openstack_region__: { get_param: openstack_region } + __keystone_url__: { get_param: keystone_url } + __docker_version__: { get_param: dcae_docker } + __dcae_repo__: { get_param: dcae_repo } + __gerrit_branch__: { get_param: dcae_branch } + __cloud_env__: { get_param: cloud_env } + __public_net_id__: { get_param: public_net_id } + __dcae_ip_addr__: { get_param: dcae_ip_addr } + __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } + __external_dns__: { get_param: external_dns } + __ubuntu_1604_image__: { get_param: ubuntu_1604_image } + __centos_7_image__: { get_param: centos_7_image } + __security_group__ : { get_param: security_group } + __flavor_medium__: { get_param: flavor_medium } + __mac_addr__: { get_attr: [dcae_c_private_port, mac_address] } + __rand_str__: { get_resource: random-str } + + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt + echo "__nexus_username__" > /opt/config/nexus_username.txt + echo "__nexus_password__" > /opt/config/nexus_password.txt + echo "__docker_version__" > /opt/config/docker_version.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dcae_zone__" > /opt/config/dcae_zone.txt + echo "__tenant_id__" > /opt/config/tenant_id.txt + echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt + echo "__openstack_user__" > /opt/config/openstack_user.txt + echo "__openstack_password__" > /opt/config/openstack_password.txt + echo "__key_name__" > /opt/config/key_name.txt + echo "__pub_key__" > /opt/config/pub_key.txt + echo "__private_key__" > /opt/config/priv_key + echo "__openstack_region__" > /opt/config/openstack_region.txt + echo "__keystone_url__" > /opt/config/keystone_url.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__public_net_id__" > /opt/config/public_net_id.txt + echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt + echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt + echo "__external_dns__" > /opt/config/external_dns.txt + echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt + echo "__centos_7_image__" > /opt/config/centos_7_image.txt + echo "__security_group__" > /opt/config/security_group.txt + echo "__flavor_medium__" > /opt/config/flavor_medium.txt + echo "__dcae_repo__" > /opt/config/remote_repo.txt + echo "__mac_addr__" > /opt/config/mac_addr.txt + echo "__rand_str__" > /opt/config/rand_str.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh + cd /opt + chmod +x dcae2_install.sh + ./dcae2_install.sh
\ No newline at end of file diff --git a/heat/ONAP/onap_rackspace.env b/heat/ONAP/onap_rackspace.env index 4f3945bf..82e31eff 100644 --- a/heat/ONAP/onap_rackspace.env +++ b/heat/ONAP/onap_rackspace.env @@ -4,10 +4,10 @@ parameters: public_net_id: 00000000-0000-0000-0000-000000000000 - key_name: onap_key - vm_base_name: vm1 + key_name: onap_key + pub_key: INSERT YOUR PUBLIC KEY HERE nexus_repo: https://nexus.onap.org/content/sites/raw @@ -32,10 +32,6 @@ parameters: artifacts_version: 1.1.0-SNAPSHOT - docker_version: 1.1-STAGING-latest - - gerrit_branch: master - cloud_env: rackspace @@ -66,20 +62,45 @@ parameters: dcae_hdp2_ip_addr: 10.0.4.104 dcae_hdp3_ip_addr: 10.0.4.105 + # ONAP repositories, docker versions, and Gerrit branches - ##################### - # # - # ONAP repositories # - # # - ##################### aai_repo: http://gerrit.onap.org/r/aai/test-config appc_repo: http://gerrit.onap.org/r/appc/deployment.git dcae_repo: http://gerrit.onap.org/r/dcae/demo/startup/controller.git mr_repo: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git - mso_repo: http://gerrit.onap.org/r/so/docker-config.git + so_repo: http://gerrit.onap.org/r/so/docker-config.git policy_repo: http://gerrit.onap.org/r/policy/docker.git portal_repo: http://gerrit.onap.org/r/portal.git robot_repo: http://gerrit.onap.org/r/testsuite/properties.git sdc_repo: http://gerrit.onap.org/r/sdc.git sdnc_repo: http://gerrit.onap.org/r/sdnc/oam.git vid_repo: http://gerrit.onap.org/r/vid.git + clamp_repo: http://gerrit.onap.org/r/clamp.git + + aai_branch: master + appc_branch: master + so_branch: master + mr_branch: master + dcae_branch: master + policy_branch: master + portal_branch: master + robot_branch: master + sdc_branch: master + sdnc_branch: master + vid_branch: master + clamp_branch: master + + aai_docker: 1.1-STAGING-latest + appc_docker: 1.1-STAGING-latest + so_docker: 1.1-STAGING-latest + mr_docker: 1.1-STAGING-latest + dcae_docker: 1.1-STAGING-latest + policy_docker: 1.1-STAGING-latest + portal_docker: 1.3-STAGING-latest + robot_docker: 1.1-STAGING-latest + sdc_docker: 1.1-STAGING-latest + sdnc_docker: 1.2-STAGING-latest + vid_docker: 1.1-STAGING-latest + clamp_docker: 1.1-STAGING-latest + dgbuilder_docker: 0.1-STAGING-latest + cli_docker: 1.1-STAGING-latest diff --git a/heat/ONAP/onap_rackspace.yaml b/heat/ONAP/onap_rackspace.yaml index a5037408..ab565550 100644 --- a/heat/ONAP/onap_rackspace.yaml +++ b/heat/ONAP/onap_rackspace.yaml @@ -89,14 +89,6 @@ parameters: type: string description: Artifacts version of ONAP components - docker_version: - type: string - description: Docker version of ONAP docker images - - gerrit_branch: - type: string - description: Gerrit branch where to download the code from - cloud_env: type: string description: Cloud Provider Name @@ -159,51 +151,85 @@ parameters: type: string description: Hadoop VM3 IP Address - - # ONAP repositories + # ONAP repositories, docker versions, and Gerrit branches aai_repo: type: string - description: AAI repository - appc_repo: type: string - description: APPC repository - dcae_repo: type: string - description: DCAE repository - mr_repo: type: string - description: Message Router repository - - mso_repo: + so_repo: type: string - description: MSO repository - policy_repo: type: string - description: Policy repository - portal_repo: type: string - description: Portal repository - robot_repo: type: string - description: Robot repository - sdc_repo: type: string - description: SDC repository - sdnc_repo: type: string - description: SDNC repository - vid_repo: type: string - description: VID repository + clamp_repo: + type: string + + aai_docker: + type: string + appc_docker: + type: string + so_docker: + type: string + mr_docker: + type: string + dcae_docker: + type: string + policy_docker: + type: string + portal_docker: + type: string + robot_docker: + type: string + sdc_docker: + type: string + sdnc_docker: + type: string + vid_docker: + type: string + clamp_docker: + type: string + dgbuilder_docker: + type: string + cli_docker: + type: string + + aai_branch: + type: string + appc_branch: + type: string + so_branch: + type: string + mr_branch: + type: string + dcae_branch: + type: string + policy_branch: + type: string + portal_branch: + type: string + robot_branch: + type: string + sdc_branch: + type: string + sdnc_branch: + type: string + vid_branch: + type: string + clamp_branch: + type: string resources: @@ -334,8 +360,8 @@ resources: __nexus_password__: { get_param: nexus_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 } + __docker_version__: { get_param: aai_docker } + __gerrit_branch__: { get_param: aai_branch } __cloud_env__: { get_param: cloud_env } __aai_repo__: { get_param: aai_repo } template: | @@ -403,8 +429,8 @@ resources: __nexus_password__: { get_param: nexus_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 } + __docker_version__: { get_param: aai_docker } + __gerrit_branch__: { get_param: aai_branch } __cloud_env__: { get_param: cloud_env } __aai_repo__: { get_param: aai_repo } template: | @@ -432,27 +458,27 @@ resources: ./aai_install.sh - # MSO instantiation - mso_private_port: + # SO instantiation + so_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.5.1}] - mso_vm: + so_vm: type: OS::Nova::Server properties: image: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM) flavor: 4 GB General Purpose v1 name: str_replace: - template: base-mso + template: base-so params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - network: { get_param: public_net_id } - - port: { get_resource: mso_private_port } + - port: { get_resource: so_private_port } user_data_format: RAW user_data: str_replace: @@ -466,10 +492,10 @@ 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 } + __docker_version__: { get_param: so_docker } + __gerrit_branch__: { get_param: so_branch } __cloud_env__: { get_param: cloud_env } - __mso_repo__: { get_param: mso_repo } + __so_repo__: { get_param: so_repo } template: | #!/bin/bash @@ -488,13 +514,13 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt - echo "__mso_repo__" > /opt/config/remote_repo.txt + echo "__so_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mso_install.sh -o /opt/mso_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/so_install.sh -o /opt/so_install.sh cd /opt - chmod +x mso_install.sh - ./mso_install.sh + chmod +x so_install.sh + ./so_install.sh # Message Router instantiation @@ -527,7 +553,7 @@ resources: __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } - __gerrit_branch__: { get_param: gerrit_branch } + __gerrit_branch__: { get_param: mr_branch } __cloud_env__: { get_param: cloud_env } __mr_repo__: { get_param: mr_repo } template: | @@ -585,10 +611,11 @@ resources: __openstack_username__: { get_param: openstack_username } __openstack_api_key__: { get_param : openstack_api_key } __openstack_password__: { get_param: openstack_password } + __openstack_tenant_id__: { get_param: openstack_tenant_id } __artifacts_version__: { get_param: artifacts_version } __openstack_region__: { get_param: openstack_region } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: robot_docker } + __gerrit_branch__: { get_param: robot_branch } __cloud_env__: { get_param: cloud_env } __robot_repo__: { get_param: robot_repo } template: | @@ -604,6 +631,7 @@ resources: echo "__openstack_username__" > /opt/config/openstack_username.txt echo "__openstack_password__" > /opt/config/openstack_password.txt echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt + echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt echo "__openstack_region__" > /opt/config/region.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__docker_version__" > /opt/config/docker_version.txt @@ -614,13 +642,14 @@ resources: echo "10.0.1.2" > /opt/config/aai2_ip_addr.txt echo "10.0.2.1" > /opt/config/appc_ip_addr.txt echo "10.0.4.1" > /opt/config/dcae_ip_addr.txt - echo "10.0.5.1" > /opt/config/mso_ip_addr.txt + echo "10.0.5.1" > /opt/config/so_ip_addr.txt echo "10.0.11.1" > /opt/config/mr_ip_addr.txt echo "10.0.6.1" > /opt/config/policy_ip_addr.txt echo "10.0.9.1" > /opt/config/portal_ip_addr.txt echo "10.0.3.1" > /opt/config/sdc_ip_addr.txt echo "10.0.7.1" > /opt/config/sdnc_ip_addr.txt echo "10.0.8.1" > /opt/config/vid_ip_addr.txt + echo "10.0.12.1" > /opt/config/clamp_ip_addr.txt echo "Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)" > /opt/config/vm_image_name.txt echo "4 GB General Purpose v1" > /opt/config/vm_flavor.txt echo "__cloud_env__" > /opt/config/cloud_env.txt @@ -663,8 +692,8 @@ resources: __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: vid_docker } + __gerrit_branch__: { get_param: vid_branch } __cloud_env__: { get_param: cloud_env } __vid_repo__: { get_param: vid_repo } template: | @@ -720,8 +749,9 @@ resources: __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: sdnc_docker } + __gerrit_branch__: { get_param: sdnc_branch } + __dgbuilder_docker__: { get_param: dgbuilder_docker } __cloud_env__: { get_param: cloud_env } __sdnc_repo__: { get_param: sdnc_repo } template: | @@ -737,6 +767,7 @@ resources: echo "10.0.0.1" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__sdnc_repo__" > /opt/config/remote_repo.txt @@ -802,8 +833,8 @@ resources: __nexus_password__: { get_param: nexus_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 } + __docker_version__: { get_param: sdc_docker } + __gerrit_branch__: { get_param: sdc_branch } __cloud_env__: { get_param: cloud_env } __sdc_repo__: { get_param: sdc_repo } template: | @@ -825,10 +856,10 @@ resources: echo "__sdc_repo__" > /opt/config/remote_repo.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/asdc_install.sh -o /opt/asdc_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdc_install.sh -o /opt/sdc_install.sh cd /opt - chmod +x asdc_install.sh - ./asdc_install.sh + chmod +x sdc_install.sh + ./sdc_install.sh # PORTAL instantiation @@ -871,9 +902,10 @@ resources: __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: portal_docker } + __gerrit_branch__: { get_param: portal_branch } __cloud_env__: { get_param: cloud_env } + __cli_docker__: { get_param: cli_docker } __portal_repo__: { get_param: portal_repo } template: | #!/bin/bash @@ -888,6 +920,7 @@ resources: echo "10.0.0.1" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__cli_docker__" > /opt/config/cli_docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__portal_repo__" > /opt/config/remote_repo.txt @@ -941,8 +974,8 @@ 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 } + __docker_version__: { get_param: dcae_docker } + __gerrit_branch__: { get_param: dcae_branch } __cloud_env__: { get_param: cloud_env } __dcae_code_version__: { get_param: dcae_code_version } __public_net_id__: { get_param: public_net_id } @@ -983,7 +1016,7 @@ resources: echo "__nexus_repo_root__" > /opt/config/nexus_repo_root.txt echo "__openstack_region__" > /opt/config/openstack_region.txt echo "https://mycloud.rackspace.com/cloud" > /opt/config/horizon_url.txt - echo "https://identity.api.rackspacecloud.com/v2.0" > /opt/config/keystone_url.txt + echo "https://identity.api.rackspacecloud.com" > /opt/config/keystone_url.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__dcae_code_version__" > /opt/config/dcae_code_version.txt echo "__public_net_id__" > /opt/config/public_net_id.txt @@ -1044,8 +1077,8 @@ resources: __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: policy_docker } + __gerrit_branch__: { get_param: policy_branch } __cloud_env__: { get_param: cloud_env } __policy_repo__: { get_param: policy_repo } template: | @@ -1102,8 +1135,9 @@ resources: __nexus_password__: { get_param: nexus_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 } + __docker_version__: { get_param: appc_docker } + __gerrit_branch__: { get_param: appc_branch } + __dgbuilder_docker__: { get_param: dgbuilder_docker } __cloud_env__: { get_param: cloud_env } __appc_repo__: { get_param: appc_repo } template: | @@ -1120,6 +1154,7 @@ resources: echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__appc_repo__" > /opt/config/remote_repo.txt @@ -1127,4 +1162,69 @@ resources: curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh cd /opt chmod +x appc_install.sh - ./appc_install.sh
\ No newline at end of file + ./appc_install.sh + + + # CLAMP instantiation + clamp_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.12.1}] + + clamp_vm: + type: OS::Nova::Server + properties: + image: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM) + flavor: 4 GB General Purpose v1 + name: + str_replace: + template: base-clamp + params: + base: { get_param: vm_base_name } + key_name: { get_resource: vm_key } + networks: + - network: { get_param: public_net_id } + - port: { get_resource: clamp_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __openstack_username__: { get_param: openstack_username } + __openstack_tenant_id__: { get_param: openstack_tenant_id } + __openstack_api_key__: { get_param: openstack_api_key } + __dmaap_topic__: { get_param: dmaap_topic } + __artifacts_version__: { get_param: artifacts_version } + __docker_version__: { get_param: clamp_docker } + __gerrit_branch__: { get_param: clamp_branch } + __cloud_env__: { get_param: cloud_env } + __clamp_repo__: { get_param: clamp_repo } + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt + echo "__nexus_username__" > /opt/config/nexus_username.txt + echo "__nexus_password__" > /opt/config/nexus_password.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "10.0.0.1" > /opt/config/dns_ip_addr.txt + echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt + echo "__openstack_username__" > /opt/config/openstack_username.txt + echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt + echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt + echo "__docker_version__" > /opt/config/docker_version.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__clamp_repo__" > /opt/config/remote_repo.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh + cd /opt + chmod +x clamp_install.sh + ./clamp_install.sh diff --git a/heat/vCPE/infra/MANIFEST.json b/heat/vCPE/infra/MANIFEST.json index 7c4780d6..11ce42f9 100644 --- a/heat/vCPE/infra/MANIFEST.json +++ b/heat/vCPE/infra/MANIFEST.json @@ -3,12 +3,12 @@ "description": "", "data": [ { - "file": "base_vcpe_infra_rackspace.yaml", + "file": "base_vcpe_infra.yaml", "type": "HEAT", "isBase": "true", "data": [ { - "file": "base_vcpe_infra_rackspace.env", + "file": "base_vcpe_infra.env", "type": "HEAT_ENV" } ] diff --git a/heat/vCPE/infra/base_vcpe_infra_rackspace.env b/heat/vCPE/infra/base_vcpe_infra.env index 4de60903..1d820705 100644 --- a/heat/vCPE/infra/base_vcpe_infra_rackspace.env +++ b/heat/vCPE/infra/base_vcpe_infra.env @@ -1,24 +1,27 @@ parameters: - vcpe_image_name: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM) - vcpe_flavor_name: 4 GB General Purpose v1 - public_net_id: 00000000-0000-0000-0000-000000000000 + vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED) + vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) + public_net_id: PUT THE PUBLIC NETWORK ID HERE cpe_signal_net_id: zdfw1cpe01_private + cpe_signal_subnet_id: zdfw1cpe01_sub_private cpe_public_net_id: zdfw1cpe01_public + cpe_public_subnet_id: zdfw1cpe01_sub_public onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE - onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE + onap_private_subnet_id: PUT THE ONAP PRIVATE SUBNETWORK NAME HERE onap_private_net_cidr: 10.0.0.0/16 cpe_signal_net_cidr: 10.4.0.0/24 cpe_public_net_cidr: 10.2.0.0/24 vdhcp_private_ip_0: 10.4.0.1 vdhcp_private_ip_1: 10.0.101.1 - vaaa_private_ip_0: 10.4.0.2 + vaaa_private_ip_0: 10.4.0.4 vaaa_private_ip_1: 10.0.101.2 vdns_private_ip_0: 10.2.0.1 vdns_private_ip_1: 10.0.101.3 vweb_private_ip_0: 10.2.0.10 vweb_private_ip_1: 10.0.101.40 + mr_ip_addr: 10.0.11.1 vaaa_name_0: zdcpe1cpe01aaa01 - vdns_name_0: zdcpe11cpe01dns01 + vdns_name_0: zdcpe1cpe01dns01 vdhcp_name_0: zdcpe1cpe01dhcp01 vweb_name_0: zdcpe1cpe01web01 vnf_id: vCPE_Infrastructure_demo_app @@ -31,4 +34,4 @@ parameters: install_script_version: 1.1.0-SNAPSHOT key_name: vaaa_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN - cloud_env: rackspace + cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) diff --git a/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml b/heat/vCPE/infra/base_vcpe_infra.yaml index 6b9160bc..c6349581 100644 --- a/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml +++ b/heat/vCPE/infra/base_vcpe_infra.yaml @@ -24,7 +24,7 @@ heat_template_version: 2013-05-23 -description: Heat template to deploy vCPE Infrastructue emlements (vAAA, vDHCP, vDNS_DHCP, webServer_sink) for ONAP +description: Heat template to deploy vCPE Infrastructue emlements (vAAA, vDHCP, vDNS_DHCP, webServer) ############## # # @@ -61,6 +61,10 @@ parameters: type: string label: vAAA private network name or ID description: Private network that connects vAAA with vDNSs + cpe_signal_subnet_id: + type: string + label: CPE Signal subnet + description: CPE Signal subnet cpe_signal_net_cidr: type: string label: vAAA private network CIDR @@ -69,6 +73,10 @@ parameters: type: string label: vCPE Public network (emulates internet) name or ID description: Private network that connects vGW to emulated internet + cpe_public_subnet_id: + type: string + label: CPE Public subnet + description: CPE Public subnet cpe_public_net_cidr: type: string label: vCPE public network CIDR @@ -76,7 +84,7 @@ parameters: vaaa_private_ip_0: type: string label: vAAA private IP address towards the CPE_SIGNAL private network - description: Private IP address that is assigned to the vAAA to communicate with the vCPE components + description: Private IP address that is assigned to the vAAA to communicate with the vCPE components vaaa_private_ip_1: type: string label: vAAA private IP address towards the ONAP management network @@ -137,6 +145,10 @@ parameters: type: string label: DCAE collector port description: Port of the DCAE collector + mr_ip_addr: + type: string + label: Message Router IP address + description: IP address of the Message Router that for vDHCP configuration key_name: type: string label: Key pair name @@ -191,37 +203,13 @@ resources: public_key: { get_param: pub_key } save_private_key: false - cpe_signal_network: - type: OS::Neutron::Net - properties: - name: { get_param: cpe_signal_net_id } - - cpe_signal_subnet: - type: OS::Neutron::Subnet - properties: - name: { get_param: cpe_signal_net_id } - network_id: { get_resource: cpe_signal_network } - cidr: { get_param: cpe_signal_net_cidr } - - cpe_public_network: - type: OS::Neutron::Net - properties: - name: { get_param: cpe_public_net_id } - - cpe_public_subnet: - type: OS::Neutron::Subnet - properties: - name: { get_param: cpe_public_net_id } - network_id: { get_resource: cpe_public_network } - cidr: { get_param: cpe_public_net_cidr } - # Virtual AAA server Instantiation vaaa_private_0_port: type: OS::Neutron::Port properties: - network: { get_resource: cpe_signal_network } - fixed_ips: [{"subnet": { get_resource: cpe_signal_subnet }, "ip_address": { get_param: vaaa_private_ip_0 }}] + network: { get_param: cpe_signal_net_id } + fixed_ips: [{"subnet": { get_param: cpe_signal_subnet_id }, "ip_address": { get_param: vaaa_private_ip_0 }}] vaaa_private_1_port: type: OS::Neutron::Port @@ -284,8 +272,8 @@ resources: vdns_private_0_port: type: OS::Neutron::Port properties: - network: { get_resource: cpe_public_network } - fixed_ips: [{"subnet": { get_resource: cpe_public_subnet }, "ip_address": { get_param: vdns_private_ip_0 }}] + network: { get_param: cpe_public_net_id } + fixed_ips: [{"subnet": { get_param: cpe_public_subnet_id }, "ip_address": { get_param: vdns_private_ip_0 }}] vdns_private_1_port: type: OS::Neutron::Port @@ -344,8 +332,8 @@ resources: vdhcp_private_0_port: type: OS::Neutron::Port properties: - network: { get_resource: cpe_signal_network } - fixed_ips: [{"subnet": { get_resource: cpe_signal_subnet }, "ip_address": { get_param: vdhcp_private_ip_0 }}] + network: { get_param: cpe_signal_net_id } + fixed_ips: [{"subnet": { get_param: cpe_signal_subnet_id }, "ip_address": { get_param: vdhcp_private_ip_0 }}] vdhcp_private_1_port: type: OS::Neutron::Port @@ -370,9 +358,10 @@ resources: str_replace: params: __oam_ipaddr__ : { get_param: vdhcp_private_ip_1 } - __cpe_signal_ipaddr__: { get_param: vdhcp_private_ip_0 } - __oam_cidr__: { get_param: onap_private_net_cidr } - __cpe_signal_net_cidr__: { get_param: cpe_signal_net_cidr } + __cpe_signal_ipaddr__ : { get_param: vdhcp_private_ip_0 } + __oam_cidr__ : { get_param: onap_private_net_cidr } + __cpe_signal_net_cidr__ : { get_param: cpe_signal_net_cidr } + __mr_ip_addr__ : { get_param: mr_ip_addr } __repo_url_blob__ : { get_param: repo_url_blob } __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } @@ -387,6 +376,7 @@ resources: echo "__cpe_signal_ipaddr__" > /opt/config/cpe_signal_ipaddr.txt echo "__oam_cidr__" > /opt/config/oam_cidr.txt echo "__cpe_signal_net_cidr__" > /opt/config/cpe_signal_net_cidr.txt + echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt @@ -403,8 +393,8 @@ resources: vweb_private_0_port: type: OS::Neutron::Port properties: - network: { get_resource: cpe_public_network } - fixed_ips: [{"subnet": { get_resource: cpe_public_subnet }, "ip_address": { get_param: vweb_private_ip_0 }}] + network: { get_param: cpe_public_net_id } + fixed_ips: [{"subnet": { get_param: cpe_public_subnet_id }, "ip_address": { get_param: vweb_private_ip_0 }}] vweb_private_1_port: type: OS::Neutron::Port diff --git a/heat/vCPE/vbng/MANIFEST.json b/heat/vCPE/vbng/MANIFEST.json index f4fbb305..0b34111e 100644 --- a/heat/vCPE/vbng/MANIFEST.json +++ b/heat/vCPE/vbng/MANIFEST.json @@ -3,12 +3,12 @@ "description": "", "data": [ { - "file": "base_vcpe_vbng_rackspace.yaml", + "file": "base_vcpe_vbng.yaml", "type": "HEAT", "isBase": "true", "data": [ { - "file": "base_vcpe_vbng_rackspace.env", + "file": "base_vcpe_vbng.env", "type": "HEAT_ENV" } ] diff --git a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env b/heat/vCPE/vbng/base_vcpe_vbng.env index e50d4834..be4f9728 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env +++ b/heat/vCPE/vbng/base_vcpe_vbng.env @@ -1,19 +1,22 @@ parameters: - vcpe_image_name: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM) - vcpe_flavor_name: 4 GB General Purpose v1 - public_net_id: 00000000-0000-0000-0000-000000000000 + vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED) + vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) + public_net_id: PUT THE PUBLIC NETWORK ID HERE brgemu_bng_private_net_id: zdfw1bngin01_private + brgemu_bng_private_subnet_id: zdfw1bngin01_sub_private bng_gmux_private_net_id: zdfw1bngmux01_private - onap_private_net_id: <PUT_YOUR_ONAP_NET_ID_HERE> - onap_private_subnet_id: <PUT_YOUR_ONAP_NET_ID_HERE> + bng_gmux_private_subnet_id: zdfw1bngmux01_sub_private + onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE + onap_private_subnet_id: PUT THE ONAP PRIVATE SUBNETWORK NAME HERE onap_private_net_cidr: 10.0.0.0/16 cpe_signal_net_id: zdfw1cpe01_private + cpe_signal_subnet_id: zdfw1cpe01_sub_private brgemu_bng_private_net_cidr: 10.3.0.0/24 bng_gmux_private_net_cidr: 10.1.0.0/24 cpe_signal_private_net_cidr: 10.4.0.0/24 vbng_private_ip_0: 10.3.0.1 vbng_private_ip_1: 10.0.101.10 - vbng_private_ip_2: 10.4.0.3
+ vbng_private_ip_2: 10.4.0.3 vbng_private_ip_3: 10.1.0.10 vbng_name_0: zdcpe1cpe01bng01 vnf_id: vCPE_Infrastructure_Metro_vBNG_demo_app @@ -26,4 +29,7 @@ install_script_version: 1.1.0-SNAPSHOT key_name: vbng_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN - cloud_env: rackspace + cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) + vpp_source_repo_url: https://gerrit.fd.io/r/vpp + vpp_source_repo_branch: stable/1704 + vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-radius-client-for-vbng/src/patches/Vpp-Integrate-FreeRADIUS-Client-for-vBNG.patch diff --git a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml b/heat/vCPE/vbng/base_vcpe_vbng.yaml index d5c0eed8..9cc44840 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml +++ b/heat/vCPE/vbng/base_vcpe_vbng.yaml @@ -24,7 +24,7 @@ heat_template_version: 2013-05-23 -description: Heat template to deploy vCPE virtual Broadband Network Gateway (vBNG) for ONAP +description: Heat template to deploy vCPE virtual Broadband Network Gateway (vBNG) ############## # # @@ -49,6 +49,10 @@ parameters: type: string label: vBNG IN private network name or ID description: Private network that connects vBRG to vBNG + brgemu_bng_private_subnet_id: + type: string + label: vBNG IN private sub-network name or ID + description: vBNG IN private sub-network name or ID brgemu_bng_private_net_cidr: type: string label: vBNG IN private network CIDR @@ -57,6 +61,10 @@ parameters: type: string label: vBNG vGMUX private network name or ID description: Private network that connects vBNG to vGMUX + bng_gmux_private_subnet_id: + type: string + label: vBNG vGMUX private sub-network name or ID + description: vBNG vGMUX private sub-network name or ID bng_gmux_private_net_cidr: type: string label: vGMUX private network CIDR @@ -77,6 +85,10 @@ parameters: type: string label: vCPE private network name or ID description: Private network that connects vCPE elements with vCPE infrastructure elements + cpe_signal_subnet_id: + type: string + label: vCPE private sub-network name or ID + description: vCPE private sub-network name or ID cpe_signal_private_net_cidr: type: string label: vAAA private network CIDR @@ -145,6 +157,18 @@ parameters: type: string label: Cloud environment description: Cloud environment (e.g., openstack, rackspace) + vpp_source_repo_url: + type: string + label: VPP Source Git Repo + description: URL for VPP source codes + vpp_source_repo_branch: + type: string + label: VPP Source Git Branch + description: Git Branch for the VPP source codes + vpp_patch_url: + type: string + label: VPP Patch URL + description: URL for VPP patch for vBNG ############# # # @@ -171,24 +195,13 @@ resources: public_key: { get_param: pub_key } save_private_key: false - brgemu_bng_private_network: - type: OS::Neutron::Net - properties: - name: { get_param: brgemu_bng_private_net_id } - - brgemu_bng_private_subnet: - type: OS::Neutron::Subnet - properties: - name: { get_param: brgemu_bng_private_net_id } - network_id: { get_resource: brgemu_bng_private_network } - cidr: { get_param: brgemu_bng_private_net_cidr } # Virtual BNG Instantiation vbng_private_0_port: type: OS::Neutron::Port properties: - network: { get_resource: brgemu_bng_private_network } - fixed_ips: [{"subnet": { get_resource: brgemu_bng_private_subnet }, "ip_address": { get_param: vbng_private_ip_0 }}] + network: { get_param: brgemu_bng_private_net_id } + fixed_ips: [{"subnet": { get_param: brgemu_bng_private_subnet_id }, "ip_address": { get_param: vbng_private_ip_0 }}] vbng_private_1_port: type: OS::Neutron::Port @@ -200,13 +213,13 @@ resources: type: OS::Neutron::Port properties: network: { get_param: cpe_signal_net_id } - fixed_ips: [{"subnet": { get_param: cpe_signal_net_id }, "ip_address": { get_param: vbng_private_ip_2 }}] + fixed_ips: [{"subnet": { get_param: cpe_signal_subnet_id }, "ip_address": { get_param: vbng_private_ip_2 }}] vbng_private_3_port: type: OS::Neutron::Port properties: network: { get_param: bng_gmux_private_net_id } - fixed_ips: [{"subnet": { get_param: bng_gmux_private_net_id }, "ip_address": { get_param: vbng_private_ip_3 }}] + fixed_ips: [{"subnet": { get_param: bng_gmux_private_subnet_id }, "ip_address": { get_param: vbng_private_ip_3 }}] vbng_0: type: OS::Nova::Server @@ -240,6 +253,9 @@ resources: __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __cloud_env__ : { get_param: cloud_env } + __vpp_source_repo_url__ : { get_param: vpp_source_repo_url } + __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch } + __vpp_patch_url__ : { get_param: vpp_patch_url } template: | #!/bin/bash @@ -260,6 +276,9 @@ resources: echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt + echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt + echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt # Download and run install script curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_bng_install.sh -o /opt/v_bng_install.sh diff --git a/heat/vCPE/vbrgemu/MANIFEST.json b/heat/vCPE/vbrgemu/MANIFEST.json index 0edc4b9d..603f92d9 100644 --- a/heat/vCPE/vbrgemu/MANIFEST.json +++ b/heat/vCPE/vbrgemu/MANIFEST.json @@ -3,12 +3,12 @@ "description": "", "data": [ { - "file": "base_vcpe_vbrgemu_rackspace.yaml", + "file": "base_vcpe_vbrgemu.yaml", "type": "HEAT", "isBase": "true", "data": [ { - "file": "base_vcpe_vbrgemu_rackspace.env", + "file": "base_vcpe_vbrgemu.env", "type": "HEAT_ENV" } ] diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env index 0d4d894e..ea8bc823 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env @@ -1,14 +1,16 @@ parameters: - vcpe_image_name: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM) - vcpe_flavor_name: 4 GB General Purpose v1 - public_net_id: 00000000-0000-0000-0000-000000000000 + vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED) + vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) + public_net_id: PUT THE PUBLIC NETWORK ID HERE vbrgemu_bng_private_net_id: zdfw1bngin01_private - vbrgemu_private_net_id: zdfw1vbrgemu01_private + vbrgemu_bng_private_subnet_id: zdfw1bngin01_sub_private vbrgemu_bng_private_net_cidr: 10.3.0.0/24 + vbrgemu_private_net_id: zdfw1vbrgemu01_private vbrgemu_private_net_cidr: 192.168.1.0/24 - vbrgemu_private_ip_0: 10.3.0.2 - vbrgemu_private_ip_1: 192.168.1.1
- vbrgemu_name_0: zdcpe11cpe01brgemu01 + vbrgemu_private_ip_0: 10.3.0.4 + vbrgemu_private_ip_1: 192.168.1.1 + sdnc_ip: 10.0.7.1 + vbrgemu_name_0: zdcpe1cpe01brgemu01 vnf_id: vCPE_Infrastructure_BGREMU_demo_app vf_module_id: vCPE_Customer_BRGEMU repo_url_blob: https://nexus.onap.org/content/sites/raw @@ -17,4 +19,9 @@ install_script_version: 1.1.0-SNAPSHOT key_name: vbrgemu_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN - cloud_env: rackspace + cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) + vpp_source_repo_url: https://gerrit.fd.io/r/vpp + vpp_source_repo_branch: stable/1704 + hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp + hc2vpp_source_repo_branch: stable/1704 + vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml index 6f926eb5..a9eb8726 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml @@ -24,7 +24,7 @@ heat_template_version: 2013-05-23 -description: Heat template to deploy vCPE vBRG Emulator (vBRGEMU) for ONAP +description: Heat template to deploy vCPE vBRG Emulator (vBRGEMU) ####################################################################### # # @@ -51,6 +51,10 @@ parameters: type: string label: vBNG private network name or ID description: Private network that connects vBRGEMU to vBNG + vbrgemu_bng_private_subnet_id: + type: string + label: vBNG private sub-network name or ID + description: vBNG private sub-network name or ID vbrgemu_bng_private_net_cidr: type: string label: vBNG IN private network CIDR @@ -111,6 +115,30 @@ parameters: type: string label: Cloud environment description: Cloud environment (e.g., openstack, rackspace) + vpp_source_repo_url: + type: string + label: VPP Source Git Repo + description: URL for VPP source codes + vpp_source_repo_branch: + type: string + label: VPP Source Git Branch + description: Git Branch for the VPP source codes + hc2vpp_source_repo_url: + type: string + label: Honeycomb Source Git Repo + description: URL for Honeycomb source codes + hc2vpp_source_repo_branch: + type: string + label: Honeycomb Source Git Branch + description: Git Branch for the Honeycomb source codes + vpp_patch_url: + type: string + label: VPP Patch URL + description: URL for VPP patch for vBRG Emulator + sdnc_ip: + type: string + label: SDNC ip address + description: SDNC ip address uesd to set NAT ############# # # @@ -155,7 +183,7 @@ resources: type: OS::Neutron::Port properties: network: { get_param: vbrgemu_bng_private_net_id } - fixed_ips: [{"subnet": { get_param: vbrgemu_bng_private_net_id }, "ip_address": { get_param: vbrgemu_private_ip_0 }}] + fixed_ips: [{"subnet": { get_param: vbrgemu_bng_private_subnet_id }, "ip_address": { get_param: vbrgemu_private_ip_0 }}] vbrgemu_private_1_port: type: OS::Neutron::Port @@ -187,6 +215,12 @@ resources: __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __cloud_env__ : { get_param: cloud_env } + __vpp_source_repo_url__ : { get_param: vpp_source_repo_url } + __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch } + __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url } + __hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch } + __vpp_patch_url__ : { get_param: vpp_patch_url } + __sdnc_ip__ : { get_param: sdnc_ip } template: | #!/bin/bash @@ -200,6 +234,12 @@ resources: echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt + echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt + echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt + echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt + echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt + echo "__sdnc_ip__" > /opt/config/sdnc_ip.txt # Download and run install script curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_brgemu_install.sh -o /opt/v_brgemu_install.sh diff --git a/heat/vCPE/vgmux/MANIFEST.json b/heat/vCPE/vgmux/MANIFEST.json index 35603f9a..62d1ef97 100644 --- a/heat/vCPE/vgmux/MANIFEST.json +++ b/heat/vCPE/vgmux/MANIFEST.json @@ -3,12 +3,12 @@ "description": "", "data": [ { - "file": "base_vcpe_vgmux_rackspace.yaml", + "file": "base_vcpe_vgmux.yaml", "type": "HEAT", "isBase": "true", "data": [ { - "file": "base_vcpe_vgmux_rackspace.env", + "file": "base_vcpe_vgmux.env", "type": "HEAT_ENV" } ] diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env b/heat/vCPE/vgmux/base_vcpe_vgmux.env index 76dd86ef..aad4784b 100644 --- a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env +++ b/heat/vCPE/vgmux/base_vcpe_vgmux.env @@ -1,18 +1,20 @@ parameters: - vcpe_image_name: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM) - vcpe_flavor_name: 4 GB General Purpose v1 - public_net_id: 00000000-0000-0000-0000-000000000000 + vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED) + vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) + public_net_id: PUT THE PUBLIC NETWORK ID HERE bng_gmux_private_net_id: zdfw1bngmux01_private + bng_gmux_private_subnet_id: zdfw1bngmux01_sub_private mux_gw_private_net_id: zdfw1muxgw01_private - onap_private_net_id: <PUT_YOUR_ONAP_NET_ID_HERE> - onap_private_subnet_id: <PUT_YOUR_ONAP_NET_ID_HERE> + mux_gw_private_subnet_id: zdfw1muxgw01_sub_private + onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE + onap_private_subnet_id: PUT THE ONAP PRIVATE SUBNETWORK NAME HERE onap_private_net_cidr: 10.0.0.0/16 bng_gmux_private_net_cidr: 10.1.0.0/24 mux_gw_private_net_cidr: 10.5.0.0/24 vgmux_private_ip_0: 10.1.0.20 vgmux_private_ip_1: 10.0.101.20 vgmux_private_ip_2: 10.5.0.20 - vgmux_name_0: zdcpe11cpe01mux01 + vgmux_name_0: zdcpe1cpe01mux01 vnf_id: vCPE_Infrastructure_vGMUX_demo_app vf_module_id: vCPE_Intrastructure_Metro_vGMUX dcae_collector_ip: 10.0.4.102 @@ -21,6 +23,12 @@ repo_url_artifacts: https://nexus.onap.org/content/groups/staging demo_artifacts_version: 1.1.0 install_script_version: 1.1.0-SNAPSHOT - key_name: vbng_key + key_name: vgmux_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN - cloud_env: rackspace + cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) + vpp_source_repo_url: https://gerrit.fd.io/r/vpp + vpp_source_repo_branch: stable/1704 + hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp + hc2vpp_source_repo_branch: stable/1704 + vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Vpp-Add-VES-agent-for-vG-MUX.patch + hc2vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml index b6e212a1..4f12c64e 100644 --- a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml +++ b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml @@ -24,7 +24,7 @@ heat_template_version: 2013-05-23 -description: Heat template to deploy vCPE Infrastructue Metro vGMUX for ONAP +description: Heat template to deploy vCPE Infrastructue Metro vGMUX ############## # # @@ -49,14 +49,22 @@ parameters: type: string label: vBNG vGMUX private network name or ID description: Private network that connects vBNG to vGMUX + bng_gmux_private_subnet_id: + type: string + label: vBNG vGMUX private sub-network name or ID + description: vBNG vGMUX private sub-network name or ID bng_gmux_private_net_cidr: type: string label: vBNG vGMUX private network CIDR description: The CIDR of the vBNG-vGMUX private network mux_gw_private_net_id: type: string - label: vCPE Public network name or ID + label: vGMUX vGWs network name or ID description: Private network that connects vGMUX to vGWs + mux_gw_private_subnet_id: + type: string + label: vGMUX vGWs sub-network name or ID + description: vGMUX vGWs sub-network name or ID mux_gw_private_net_cidr: type: string label: vGMUX private network CIDR @@ -133,6 +141,30 @@ parameters: type: string label: Cloud environment description: Cloud environment (e.g., openstack, rackspace) + vpp_source_repo_url: + type: string + label: VPP Source Git Repo + description: URL for VPP source codes + vpp_source_repo_branch: + type: string + label: VPP Source Git Branch + description: Git Branch for the VPP source codes + hc2vpp_source_repo_url: + type: string + label: Honeycomb Source Git Repo + description: URL for Honeycomb source codes + hc2vpp_source_repo_branch: + type: string + label: Honeycomb Source Git Branch + description: Git Branch for the Honeycomb source codes + vpp_patch_url: + type: string + label: VPP Patch URL + description: URL for VPP patch for vG-MUX + hc2vpp_patch_url: + type: string + label: Honeycomb Patch URL + description: URL for Honeycomb patch for vG-MUX ############# # # @@ -159,36 +191,13 @@ resources: public_key: { get_param: pub_key } save_private_key: false - mux_gw_private_network: - type: OS::Neutron::Net - properties: - name: { get_param: mux_gw_private_net_id } - - mux_gw_private_subnet: - type: OS::Neutron::Subnet - properties: - name: { get_param: mux_gw_private_net_id } - network_id: { get_resource: mux_gw_private_network } - cidr: { get_param: mux_gw_private_net_cidr } - - bng_gmux_private_network: - type: OS::Neutron::Net - properties: - name: { get_param: bng_gmux_private_net_id } - - bng_gmux_private_subnet: - type: OS::Neutron::Subnet - properties: - name: { get_param: bng_gmux_private_net_id } - network_id: { get_resource: bng_gmux_private_network } - cidr: { get_param: bng_gmux_private_net_cidr } # Virtual GMUX Instantiation vgmux_private_0_port: type: OS::Neutron::Port properties: - network: { get_resource: bng_gmux_private_network } - fixed_ips: [{"subnet": { get_resource: bng_gmux_private_subnet }, "ip_address": { get_param: vgmux_private_ip_0 }}] + network: { get_param: bng_gmux_private_net_id } + fixed_ips: [{"subnet": { get_param: bng_gmux_private_subnet_id }, "ip_address": { get_param: vgmux_private_ip_0 }}] vgmux_private_1_port: type: OS::Neutron::Port @@ -199,8 +208,8 @@ resources: vgmux_private_2_port: type: OS::Neutron::Port properties: - network: { get_resource: mux_gw_private_network } - fixed_ips: [{"subnet": { get_resource: mux_gw_private_subnet }, "ip_address": { get_param: vgmux_private_ip_2 }}] + network: { get_param: mux_gw_private_net_id } + fixed_ips: [{"subnet": { get_param: mux_gw_private_subnet_id }, "ip_address": { get_param: vgmux_private_ip_2 }}] vgmux_0: type: OS::Nova::Server @@ -230,6 +239,12 @@ resources: __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __cloud_env__ : { get_param: cloud_env } + __vpp_source_repo_url__ : { get_param: vpp_source_repo_url } + __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch } + __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url } + __hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch } + __vpp_patch_url__ : { get_param: vpp_patch_url } + __hc2vpp_patch_url__ : { get_param: hc2vpp_patch_url } template: | #!/bin/bash @@ -246,10 +261,15 @@ resources: echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt + echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt + echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt + echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt + echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt + echo "__hc2vpp_patch_url__" > /opt/config/hc2vpp_patch_url.txt # Download and run install script curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_gmux_install.sh -o /opt/v_gmux_install.sh cd /opt chmod +x v_gmux_install.sh ./v_gmux_install.sh - diff --git a/heat/vCPE/vgw/MANIFEST.json b/heat/vCPE/vgw/MANIFEST.json index edaface7..f99303e4 100644 --- a/heat/vCPE/vgw/MANIFEST.json +++ b/heat/vCPE/vgw/MANIFEST.json @@ -3,12 +3,12 @@ "description": "", "data": [ { - "file": "base_vcpe_vgw_rackspace.yaml", + "file": "base_vcpe_vgw.yaml", "type": "HEAT", "isBase": "true", "data": [ { - "file": "base_vcpe_vgw_rackspace.env", + "file": "base_vcpe_vgw.env", "type": "HEAT_ENV" } ] diff --git a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env b/heat/vCPE/vgw/base_vcpe_vgw.env index 33da8d73..f1cadb83 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env +++ b/heat/vCPE/vgw/base_vcpe_vgw.env @@ -1,18 +1,20 @@ parameters: - vcpe_image_name: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM) - vcpe_flavor_name: 4 GB General Purpose v1 - public_net_id: 00000000-0000-0000-0000-000000000000 + vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED) + vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) + public_net_id: PUT THE PUBLIC NETWORK ID HERE mux_gw_private_net_id: zdfw1muxgw01_private + mux_gw_private_subnet_id: zdfw1muxgw01_sub_private mux_gw_private_net_cidr: 10.5.0.0/24 cpe_public_net_id: zdfw1cpe01_public + cpe_public_subnet_id: zdfw1cpe01_sub_public cpe_public_net_cidr: 10.2.0.0/24 - onap_private_net_id: <PUT_YOUR_ONAP_NET_ID_HERE> - onap_private_subnet_id: <PUT_YOUR_ONAP_NET_ID_HERE> + onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE + onap_private_subnet_id: PUT THE ONAP PRIVATE SUBNETWORK NAME HERE onap_private_net_cidr: 10.0.0.0/16 vgw_private_ip_0: 10.5.0.21 vgw_private_ip_1: 10.0.101.30 - vgw_private_ip_2: 10.2.0.2 - vgw_name_0: zdcpe11cpe01gw01 + vgw_private_ip_2: 10.2.0.3 + vgw_name_0: zdcpe1cpe01gw01 vnf_id: vCPE_Infrastructure_GW_demo_app vf_module_id: vCPE_Customer_GW dcae_collector_ip: 10.0.4.102 @@ -23,4 +25,8 @@ install_script_version: 1.1.0-SNAPSHOT key_name: vgw_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN - cloud_env: rackspace + cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) + vpp_source_repo_url: https://gerrit.fd.io/r/vpp + vpp_source_repo_branch: stable/1704 + hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp + hc2vpp_source_repo_branch: stable/1704 diff --git a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml b/heat/vCPE/vgw/base_vcpe_vgw.yaml index 0621556a..173ba6dd 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml +++ b/heat/vCPE/vgw/base_vcpe_vgw.yaml @@ -24,7 +24,7 @@ heat_template_version: 2013-05-23 -description: Heat template to deploy vCPE vGateway (vG) for ONAP +description: Heat template to deploy vCPE vGateway (vG) ############## # # @@ -49,6 +49,10 @@ parameters: type: string label: vGMUX private network name or ID description: Private network that connects vGMUX to vGWs + mux_gw_private_subnet_id: + type: string + label: vGMUX private sub-network name or ID + description: vGMUX private sub-network name or ID mux_gw_private_net_cidr: type: string label: vGMUX private network CIDR @@ -69,6 +73,10 @@ parameters: type: string label: vCPE network that emulates internetmanagement name or ID description: Private network that connects vGW to emulated internet + cpe_public_subnet_id: + type: string + label: vCPE Public subnet + description: vCPE Public subnet cpe_public_net_cidr: type: string label: vCPE public network CIDR @@ -133,6 +141,22 @@ parameters: type: string label: Cloud environment description: Cloud environment (e.g., openstack, rackspace) + vpp_source_repo_url: + type: string + label: VPP Source Git Repo + description: URL for VPP source codes + vpp_source_repo_branch: + type: string + label: VPP Source Git Branch + description: Git Branch for the VPP source codes + hc2vpp_source_repo_url: + type: string + label: Honeycomb Source Git Repo + description: URL for Honeycomb source codes + hc2vpp_source_repo_branch: + type: string + label: Honeycomb Source Git Branch + description: Git Branch for the Honeycomb source codes ############# # # @@ -160,13 +184,11 @@ resources: save_private_key: false # Virtual GW Instantiation - # mux_gw_private_net created by mux heat template - # cpe_public_net created by infra heat template (vDNS) vgw_private_0_port: type: OS::Neutron::Port properties: network: { get_param: mux_gw_private_net_id } - fixed_ips: [{"subnet": { get_param: mux_gw_private_net_id }, "ip_address": { get_param: vgw_private_ip_0 }}] + fixed_ips: [{"subnet": { get_param: mux_gw_private_subnet_id }, "ip_address": { get_param: vgw_private_ip_0 }}] vgw_private_1_port: type: OS::Neutron::Port @@ -178,7 +200,7 @@ resources: type: OS::Neutron::Port properties: network: { get_param: cpe_public_net_id} - fixed_ips: [{"subnet": { get_param: cpe_public_net_id }, "ip_address": { get_param: vgw_private_ip_2 }}] + fixed_ips: [{"subnet": { get_param: cpe_public_subnet_id }, "ip_address": { get_param: vgw_private_ip_2 }}] vgw_0: type: OS::Nova::Server @@ -207,6 +229,10 @@ resources: __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __cloud_env__ : { get_param: cloud_env } + __vpp_source_repo_url__ : { get_param: vpp_source_repo_url } + __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch } + __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url } + __hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch } template: | #!/bin/bash @@ -222,6 +248,10 @@ resources: echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt + echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt + echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt + echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt # Download and run install script curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_gw_install.sh -o /opt/v_gw_install.sh diff --git a/heat/vFW/.DS_Store b/heat/vFW/.DS_Store Binary files differdeleted file mode 100644 index e2759ef9..00000000 --- a/heat/vFW/.DS_Store +++ /dev/null diff --git a/heat/vFW/base_vfw_openstack.env b/heat/vFW/base_vfw.env index 7040f867..9790d0e8 100644 --- a/heat/vFW/base_vfw_openstack.env +++ b/heat/vFW/base_vfw.env @@ -29,4 +29,4 @@ parameters: install_script_version: 1.1.0-SNAPSHOT
key_name: vfw_key
pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
- cloud_env: openstack
+ cloud_env: PUT openstack OR rackspace HERE
diff --git a/heat/vFW/base_vfw_openstack.yaml b/heat/vFW/base_vfw.yaml index 4900c55c..77b53a83 100644 --- a/heat/vFW/base_vfw_openstack.yaml +++ b/heat/vFW/base_vfw.yaml @@ -208,16 +208,13 @@ resources: vfw_private_0_port:
type: OS::Neutron::Port
properties:
- security_groups: []
- port_security_enabled: False
network: { get_resource: unprotected_private_network }
fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vfw_private_ip_0 }}]
vfw_private_1_port:
type: OS::Neutron::Port
properties:
- security_groups: []
- port_security_enabled: False
+ allowed_address_pairs: [{ "ip_address": { get_param: vpg_private_ip_0 }}]
network: { get_resource: protected_private_network }
fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}]
diff --git a/heat/vFW/base_vfw_rackspace.env b/heat/vFW/base_vfw_rackspace.env deleted file mode 100644 index 0f6175d1..00000000 --- a/heat/vFW/base_vfw_rackspace.env +++ /dev/null @@ -1,32 +0,0 @@ -parameters: - vfw_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM) - vfw_flavor_name: 4 GB General Purpose v1 - public_net_id: 00000000-0000-0000-0000-000000000000 - unprotected_private_net_id: zdfw1fwl01_unprotected - protected_private_net_id: zdfw1fwl01_protected - onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE - onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE - unprotected_private_net_cidr: 192.168.10.0/24 - protected_private_net_cidr: 192.168.20.0/24 - onap_private_net_cidr: 10.0.0.0/16 - vfw_private_ip_0: 192.168.10.100 - vfw_private_ip_1: 192.168.20.100 - vfw_private_ip_2: 10.0.100.1 - vpg_private_ip_0: 192.168.10.200 - vpg_private_ip_1: 10.0.100.2 - vsn_private_ip_0: 192.168.20.250 - vsn_private_ip_1: 10.0.100.3 - vfw_name_0: zdfw1fwl01fwl01 - vpg_name_0: zdfw1fwl01pgn01 - vsn_name_0: zdfw1fwl01snk01 - vnf_id: vFirewall_demo_app - vf_module_id: vFirewall - dcae_collector_ip: 10.0.4.102 - dcae_collector_port: 8080 - repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/groups/staging - demo_artifacts_version: 1.1.0 - install_script_version: 1.1.0-SNAPSHOT - key_name: vfw_key - pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN - cloud_env: rackspace diff --git a/heat/vFW/base_vfw_rackspace.yaml b/heat/vFW/base_vfw_rackspace.yaml deleted file mode 100644 index 51ac2861..00000000 --- a/heat/vFW/base_vfw_rackspace.yaml +++ /dev/null @@ -1,377 +0,0 @@ -########################################################################## -# -#==================LICENSE_START========================================== -# -# -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -#==================LICENSE_END============================================ -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -########################################################################## - -heat_template_version: 2013-05-23 - -description: Heat template that deploys vFirewall demo app for ONAP - -############## -# # -# PARAMETERS # -# # -############## - -parameters: - vfw_image_name: - type: string - label: Image name or ID - description: Image to be used for compute instance - vfw_flavor_name: - type: string - label: Flavor - description: Type of instance (flavor) to be used - public_net_id: - type: string - label: Public network name or ID - description: Public network that enables remote connection to VNF - unprotected_private_net_id: - type: string - label: Unprotected private network name or ID - description: Private network that connects vPacketGenerator with vFirewall - protected_private_net_id: - type: string - label: Protected private network name or ID - description: Private network that connects vFirewall with vSink - onap_private_net_id: - type: string - label: ONAP management network name or ID - description: Private network that connects ONAP components and the VNF - onap_private_subnet_id: - type: string - label: ONAP management sub-network name or ID - description: Private sub-network that connects ONAP components and the VNF - unprotected_private_net_cidr: - type: string - label: Unprotected private network CIDR - description: The CIDR of the unprotected private network - protected_private_net_cidr: - type: string - label: Protected private network CIDR - description: The CIDR of the protected private network - onap_private_net_cidr: - type: string - label: ONAP private network CIDR - description: The CIDR of the protected private network - vfw_private_ip_0: - type: string - label: vFirewall private IP address towards the unprotected network - description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator - vfw_private_ip_1: - type: string - label: vFirewall private IP address towards the protected network - description: Private IP address that is assigned to the vFirewall to communicate with the vSink - vfw_private_ip_2: - type: string - label: vFirewall private IP address towards the ONAP management network - description: Private IP address that is assigned to the vFirewall to communicate with ONAP components - vpg_private_ip_0: - type: string - label: vPacketGenerator private IP address towards the unprotected network - description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall - vpg_private_ip_1: - type: string - label: vPacketGenerator private IP address towards the ONAP management network - description: Private IP address that is assigned to the vPacketGenerator to communicate with ONAP components - vsn_private_ip_0: - type: string - label: vSink private IP address towards the protected network - description: Private IP address that is assigned to the vSink to communicate with the vFirewall - vsn_private_ip_1: - type: string - label: vSink private IP address towards the ONAP management network - description: Private IP address that is assigned to the vSink to communicate with ONAP components - vfw_name_0: - type: string - label: vFirewall name - description: Name of the vFirewall - vpg_name_0: - type: string - label: vPacketGenerator name - description: Name of the vPacketGenerator - vsn_name_0: - type: string - label: vSink name - description: Name of the vSink - vnf_id: - type: string - label: VNF ID - description: The VNF ID is provided by ECOMP - vf_module_id: - type: string - label: vFirewall module ID - description: The vFirewall Module ID is provided by ECOMP - dcae_collector_ip: - type: string - label: DCAE collector IP address - description: IP address of the DCAE collector - dcae_collector_port: - type: string - label: DCAE collector port - description: Port of the DCAE collector - key_name: - type: string - label: Key pair name - description: Public/Private key pair name - pub_key: - type: string - label: Public key - description: Public key to be installed on the compute instance - repo_url_blob: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages - install_script_version: - type: string - label: Installation script version number - description: Version number of the scripts that install the vFW demo app - demo_artifacts_version: - type: string - label: Artifacts version used in demo vnfs - description: Artifacts (jar, tar.gz) version used in demo vnfs - cloud_env: - type: string - label: Cloud environment - description: Cloud environment (e.g., openstack, rackspace) - -############# -# # -# RESOURCES # -# # -############# - -resources: - random-str: - type: OS::Heat::RandomString - properties: - length: 4 - - my_keypair: - type: OS::Nova::KeyPair - properties: - name: - str_replace: - template: base_rand - params: - base: { get_param: key_name } - rand: { get_resource: random-str } - public_key: { get_param: pub_key } - save_private_key: false - - unprotected_private_network: - type: OS::Neutron::Net - properties: - name: { get_param: unprotected_private_net_id } - - protected_private_network: - type: OS::Neutron::Net - properties: - name: { get_param: protected_private_net_id } - - unprotected_private_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: unprotected_private_network } - cidr: { get_param: unprotected_private_net_cidr } - - protected_private_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: protected_private_network } - cidr: { get_param: protected_private_net_cidr } - - # Virtual Firewall instantiation - vfw_private_0_port: - type: OS::Neutron::Port - properties: - network: { get_resource: unprotected_private_network } - fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vfw_private_ip_0 }}] - - vfw_private_1_port: - type: OS::Neutron::Port - properties: - network: { get_resource: protected_private_network } - fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}] - - vfw_private_2_port: - type: OS::Neutron::Port - properties: - network: { get_param: onap_private_net_id } - fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vfw_private_ip_2 }}] - - vfw_0: - type: OS::Nova::Server - properties: - image: { get_param: vfw_image_name } - flavor: { get_param: vfw_flavor_name } - name: { get_param: vfw_name_0 } - key_name: { get_resource: my_keypair } - networks: - - network: { get_param: public_net_id } - - port: { get_resource: vfw_private_0_port } - - port: { get_resource: vfw_private_1_port } - - port: { get_resource: vfw_private_2_port } - metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} - user_data_format: RAW - user_data: - str_replace: - params: - __dcae_collector_ip__ : { get_param: dcae_collector_ip } - __dcae_collector_port__ : { get_param: dcae_collector_port } - __repo_url_blob__ : { get_param: repo_url_blob } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } - __demo_artifacts_version__ : { get_param: demo_artifacts_version } - __install_script_version__ : { get_param: install_script_version } - __cloud_env__ : { get_param: cloud_env } - template: | - #!/bin/bash - - # Create configuration files - mkdir /opt/config - echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt - echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt - echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt - echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt - echo "__install_script_version__" > /opt/config/install_script_version.txt - echo "__cloud_env__" > /opt/config/cloud_env.txt - - # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_firewall_install.sh -o /opt/v_firewall_install.sh - cd /opt - chmod +x v_firewall_install.sh - ./v_firewall_install.sh - - - # Virtual Packet Generator instantiation - vpg_private_0_port: - type: OS::Neutron::Port - properties: - network: { get_resource: unprotected_private_network } - fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vpg_private_ip_0 }}] - - vpg_private_1_port: - type: OS::Neutron::Port - properties: - network: { get_param: onap_private_net_id } - fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vpg_private_ip_1 }}] - - vpg_0: - type: OS::Nova::Server - properties: - image: { get_param: vfw_image_name } - flavor: { get_param: vfw_flavor_name } - name: { get_param: vpg_name_0 } - key_name: { get_resource: my_keypair } - networks: - - network: { get_param: public_net_id } - - port: { get_resource: vpg_private_0_port } - - port: { get_resource: vpg_private_1_port } - metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} - user_data_format: RAW - user_data: - str_replace: - params: - __fw_ipaddr__: { get_param: vfw_private_ip_0 } - __protected_net_cidr__: { get_param: protected_private_net_cidr } - __sink_ipaddr__: { get_param: vsn_private_ip_0 } - __repo_url_blob__ : { get_param: repo_url_blob } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } - __demo_artifacts_version__ : { get_param: demo_artifacts_version } - __install_script_version__ : { get_param: install_script_version } - __cloud_env__ : { get_param: cloud_env } - template: | - #!/bin/bash - - # Create configuration files - mkdir /opt/config - echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt - echo "__protected_net_cidr__" > /opt/config/protected_net_cidr.txt - echo "__sink_ipaddr__" > /opt/config/sink_ipaddr.txt - echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt - echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt - echo "__install_script_version__" > /opt/config/install_script_version.txt - echo "__cloud_env__" > /opt/config/cloud_env.txt - - # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh - cd /opt - chmod +x v_packetgen_install.sh - ./v_packetgen_install.sh - - - # Virtual Sink instantiation - vsn_private_0_port: - type: OS::Neutron::Port - properties: - network: { get_resource: protected_private_network } - fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vsn_private_ip_0 }}] - - vsn_private_1_port: - type: OS::Neutron::Port - properties: - network: { get_param: onap_private_net_id } - fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vsn_private_ip_1 }}] - - vsn_0: - type: OS::Nova::Server - properties: - image: { get_param: vfw_image_name } - flavor: { get_param: vfw_flavor_name } - name: { get_param: vsn_name_0 } - key_name: { get_resource: my_keypair } - networks: - - network: { get_param: public_net_id } - - port: { get_resource: vsn_private_0_port } - - port: { get_resource: vsn_private_1_port } - metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} - user_data_format: RAW - user_data: - str_replace: - params: - __protected_net_gw__: { get_param: vfw_private_ip_1 } - __unprotected_net__: { get_param: unprotected_private_net_cidr } - __repo_url_blob__ : { get_param: repo_url_blob } - __install_script_version__ : { get_param: install_script_version } - __cloud_env__ : { get_param: cloud_env } - template: | - #!/bin/bash - - # Create configuration files - mkdir /opt/config - echo "__protected_net_gw__" > /opt/config/protected_net_gw.txt - echo "__unprotected_net__" > /opt/config/unprotected_net.txt - echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt - echo "__install_script_version__" > /opt/config/install_script_version.txt - echo "__cloud_env__" > /opt/config/cloud_env.txt - - # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_sink_install.sh -o /opt/v_sink_install.sh - cd /opt - chmod +x v_sink_install.sh - ./v_sink_install.sh
\ No newline at end of file |