aboutsummaryrefslogtreecommitdiffstats
path: root/heat/ONAP/onap_rackspace.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'heat/ONAP/onap_rackspace.yaml')
-rw-r--r--heat/ONAP/onap_rackspace.yaml336
1 files changed, 252 insertions, 84 deletions
diff --git a/heat/ONAP/onap_rackspace.yaml b/heat/ONAP/onap_rackspace.yaml
index f62043a2..27652a4b 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
@@ -105,7 +97,7 @@ parameters:
# Parameters for DCAE instantiation
dcae_base_environment:
type: string
- description: DCAE Base Environment configuration (RACKSPACE/2-NIC/...)
+ description: DCAE Base Environment configuration (for this template, only RACKSPACE is supported)
dcae_zone:
type: string
@@ -159,6 +151,84 @@ parameters:
type: string
description: Hadoop VM3 IP Address
+ # ONAP repositories, docker versions, and Gerrit branches
+ aai_repo:
+ type: string
+ appc_repo:
+ type: string
+ dcae_repo:
+ type: string
+ mr_repo:
+ type: string
+ so_repo:
+ type: string
+ policy_repo:
+ type: string
+ portal_repo:
+ type: string
+ robot_repo:
+ type: string
+ sdc_repo:
+ type: string
+ sdnc_repo:
+ type: string
+ vid_repo:
+ type: string
+ 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
+
+ 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:
random-str:
@@ -181,24 +251,24 @@ resources:
# ONAP management private network
- oam_ecomp:
+ oam_onap:
type: OS::Neutron::Net
properties:
name:
str_replace:
- template: oam_ecomp_rand
+ template: oam_onap_rand
params:
rand: { get_resource: random-str }
- oam_ecomp_subnet:
+ oam_onap_subnet:
type: OS::Neutron::Subnet
properties:
name:
str_replace:
- template: oam_ecomp_rand
+ template: oam_onap_rand
params:
rand: { get_resource: random-str }
- network_id: { get_resource: oam_ecomp }
+ network_id: { get_resource: oam_onap }
cidr: 10.0.0.0/16
@@ -206,8 +276,8 @@ resources:
dns_private_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: oam_ecomp }
- fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.0.1}]
+ network: { get_resource: oam_onap }
+ fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.0.1}]
dns_vm:
type: OS::Nova::Server
@@ -250,8 +320,8 @@ resources:
aai1_private_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: oam_ecomp }
- fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.1.1}]
+ network: { get_resource: oam_onap }
+ fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.1.1}]
aai1_volume:
type: OS::Cinder::Volume
@@ -288,9 +358,10 @@ 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: |
#!/bin/bash
@@ -307,19 +378,20 @@ resources:
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
echo "aai_instance_1" > /opt/config/aai_instance.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
+ echo "__aai_repo__" > /opt/config/remote_repo.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai2_install.sh -o /opt/aai2_install.sh
+ curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
cd /opt
- chmod +x aai2_install.sh
- ./aai2_install.sh
+ chmod +x aai_install.sh
+ ./aai_install.sh
aai2_private_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: oam_ecomp }
- fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.1.2}]
+ network: { get_resource: oam_onap }
+ fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.1.2}]
aai2_volume:
type: OS::Cinder::Volume
@@ -355,9 +427,10 @@ 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: |
#!/bin/bash
@@ -374,35 +447,36 @@ resources:
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
echo "aai_instance_2" > /opt/config/aai_instance.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
+ echo "__aai_repo__" > /opt/config/remote_repo.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai2_install.sh -o /opt/aai2_install.sh
+ curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
cd /opt
- chmod +x aai2_install.sh
- ./aai2_install.sh
+ chmod +x aai_install.sh
+ ./aai_install.sh
- # MSO instantiation
- mso_private_port:
+ # SO instantiation
+ so_private_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: oam_ecomp }
- fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.5.1}]
+ 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:
@@ -416,9 +490,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 }
+ __so_repo__: { get_param: so_repo }
template: |
#!/bin/bash
@@ -437,20 +512,21 @@ 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 "__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
mrouter_private_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: oam_ecomp }
- fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.11.1}]
+ network: { get_resource: oam_onap }
+ fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.11.1}]
mrouter_vm:
type: OS::Nova::Server
@@ -475,8 +551,9 @@ 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: |
#!/bin/bash
@@ -490,6 +567,7 @@ resources:
echo "10.0.0.1" > /opt/config/dns_ip_addr.txt
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
+ echo "__mr_repo__" > /opt/config/remote_repo.txt
# Download and run install script
curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh
@@ -502,8 +580,8 @@ resources:
robot_private_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: oam_ecomp }
- fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.10.1}]
+ network: { get_resource: oam_onap }
+ fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.10.1}]
robot_vm:
type: OS::Nova::Server
@@ -527,15 +605,17 @@ resources:
__nexus_docker_repo__: { get_param: nexus_docker_repo }
__nexus_username__: { get_param: nexus_username }
__nexus_password__: { get_param: nexus_password }
- __network_name__: { get_attr: [oam_ecomp, name] }
+ __network_name__: { get_attr: [oam_onap, name] }
__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: |
#!/bin/bash
@@ -549,6 +629,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
@@ -559,16 +640,18 @@ 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
+ echo "__robot_repo__" > /opt/config/remote_repo.txt
# Download and run install script
curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/robot_install.sh -o /opt/robot_install.sh
@@ -581,8 +664,8 @@ resources:
vid_private_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: oam_ecomp }
- fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.8.1}]
+ network: { get_resource: oam_onap }
+ fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.8.1}]
vid_vm:
type: OS::Nova::Server
@@ -607,9 +690,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: vid_docker }
+ __gerrit_branch__: { get_param: vid_branch }
__cloud_env__: { get_param: cloud_env }
+ __vid_repo__: { get_param: vid_repo }
template: |
#!/bin/bash
@@ -624,6 +708,7 @@ 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 "__vid_repo__" > /opt/config/remote_repo.txt
# Download and run install script
curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/vid_install.sh -o /opt/vid_install.sh
@@ -636,8 +721,8 @@ resources:
sdnc_private_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: oam_ecomp }
- fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.7.1}]
+ network: { get_resource: oam_onap }
+ fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.7.1}]
sdnc_vm:
type: OS::Nova::Server
@@ -662,9 +747,11 @@ 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: |
#!/bin/bash
@@ -678,7 +765,9 @@ 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
# Download and run install script
curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdnc_install.sh -o /opt/sdnc_install.sh
@@ -691,8 +780,8 @@ resources:
sdc_private_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: oam_ecomp }
- fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.3.1}]
+ network: { get_resource: oam_onap }
+ fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.3.1}]
sdc_volume_local:
type: OS::Cinder::Volume
@@ -742,9 +831,10 @@ 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: |
#!/bin/bash
@@ -761,20 +851,21 @@ 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 "__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
portal_private_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: oam_ecomp }
- fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.9.1}]
+ network: { get_resource: oam_onap }
+ fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.9.1}]
portal_volume:
type: OS::Cinder::Volume
@@ -809,9 +900,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 }
+ __portal_repo__: { get_param: portal_repo }
template: |
#!/bin/bash
@@ -826,6 +918,7 @@ 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 "__portal_repo__" > /opt/config/remote_repo.txt
# Download and run install script
curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/portal_install.sh -o /opt/portal_install.sh
@@ -838,8 +931,8 @@ resources:
dcae_c_private_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: oam_ecomp }
- fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.4.1}]
+ network: { get_resource: oam_onap }
+ fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.4.1}]
dcae_c_vm:
type: OS::Nova::Server
properties:
@@ -868,7 +961,7 @@ resources:
__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_ecomp, name] }
+ __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 }
@@ -877,8 +970,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 }
@@ -889,6 +982,8 @@ resources:
__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_repo__: { get_param: dcae_repo }
+ __mr_repo__: { get_param: mr_repo }
template: |
#!/bin/bash
@@ -928,6 +1023,8 @@ resources:
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_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
@@ -940,8 +1037,8 @@ resources:
policy_private_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: oam_ecomp }
- fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.6.1}]
+ network: { get_resource: oam_onap }
+ fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.6.1}]
policy_volume:
type: OS::Cinder::Volume
@@ -976,9 +1073,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: policy_docker }
+ __gerrit_branch__: { get_param: policy_branch }
__cloud_env__: { get_param: cloud_env }
+ __policy_repo__: { get_param: policy_repo }
template: |
#!/bin/bash
@@ -993,6 +1091,7 @@ 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 "__policy_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
@@ -1005,8 +1104,8 @@ resources:
appc_private_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: oam_ecomp }
- fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.2.1}]
+ network: { get_resource: oam_onap }
+ fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.2.1}]
appc_vm:
type: OS::Nova::Server
@@ -1032,9 +1131,11 @@ 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: |
#!/bin/bash
@@ -1049,10 +1150,77 @@ 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
# Download and run install script
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