diff options
| author |   Lusheng Ji <lji@research.att.com> | 2018-04-03 23:18:58 -0400 |
|---|---|---|
| committer | Lusheng Ji <lji@research.att.com> | 2018-04-04 03:43:47 +0000 |
| commit | 1b98d1abab0dd111b25b4d5cbc1201f992e7cd78 (patch) | |
| tree | b92a7cafddd69d03e3702833a5ce29474b8e7e13 /heat | |
| parent | 638615104024658d5c49ee4f385e1d092a4c0f5b (diff) | |
Add code for R2MVP deployment
Added code using a "dcae_deployment_profile" parameter to control
what kind of deployment for DCAE. R1 is for ONAP Amsterdam deployment
(bootstrap installs Cloudify Manager then uses CM to deploy additional
VMs). R2MVP is a new MVP deployment, with only service components such
as VES collector and supporting components. All components are
deployed with their default configurations. R2MVP does not support
dynamic depoyment of additional assets and configuration via CLAMP.
Issue-ID: DCAEGEN2-206
Change-Id: Ide51c780a45c23f33123d52f9df225b8715833d3
Signed-off-by: Lusheng Ji <lji@research.att.com>
Diffstat (limited to 'heat')
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 5798e160..546bd920 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -100,6 +100,7 @@ parameters: # # ########################### + dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R1 or R2MVP) dnsaas_config_enabled: PUT WHETHER TO USE PROXYED DESIGNATE dnsaas_region: PUT THE DESIGNATE PROVIDING OPENSTACK'S REGION HERE dnsaas_keystone_url: PUT THE DESIGNATE PROVIDING OPENSTACK'S KEYSTONE URL HERE diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 82ca78b0..e48eec4a 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -216,6 +216,10 @@ parameters: # # ########################### + dcae_deployment_profile: + type: string + description: DCAE deployment profile. Currently supported profiles R1, R2MVP. + dnsaas_config_enabled: type: string description: whether the DNSaaS configuration section is enabled @@ -1677,7 +1681,7 @@ resources: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } - flavor: { get_param: flavor_small } + flavor: { get_param: flavor_large } name: str_replace: template: base-dcae-bootstrap @@ -1701,6 +1705,7 @@ resources: __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs + __dcae_deployment_profile__: { get_param: dcae_deployment_profile } __mac_addr__: { get_attr: [dcae_c_private_port, mac_address] } __dcae_ip_addr__: { get_param: dcae_ip_addr } __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } @@ -1772,6 +1777,7 @@ resources: echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs + echo "__dcae_deployment_profile__" > /opt/config/dcae_deployment_profile.txt echo "__mac_addr__" > /opt/config/mac_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt @@ -1810,6 +1816,7 @@ resources: echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/msb_ip_addr.txt echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt # floating IPs |