aboutsummaryrefslogtreecommitdiffstats
path: root/heat
diff options
context:
space:
mode:
Diffstat (limited to 'heat')
-rw-r--r--heat/ONAP/onap_openstack.env52
-rw-r--r--heat/ONAP/onap_openstack.yaml362
-rw-r--r--heat/ONAP/onap_openstack_float.env57
-rw-r--r--heat/ONAP/onap_openstack_float.yaml412
-rw-r--r--heat/ONAP/onap_openstack_nofloat.env55
-rw-r--r--heat/ONAP/onap_openstack_nofloat.yaml349
-rw-r--r--heat/ONAP/onap_rackspace.env39
-rw-r--r--heat/ONAP/onap_rackspace.yaml165
8 files changed, 981 insertions, 510 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 964ec080..74a9c8ed 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -20,6 +20,8 @@ parameters:
flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
+ flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
+
vm_base_name: vm1
key_name: onap_key
@@ -38,10 +40,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
@@ -67,10 +65,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 +79,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
@@ -90,6 +88,7 @@ parameters:
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
@@ -118,6 +117,44 @@ 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-STAGING-latest
+ policy_docker: 1.1-STAGING-latest
+ portal_docker: 1.1-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
+ dgbuilder_docker: 0.1-STAGING-latest
+
#####################
# #
# ONAP repositories #
@@ -127,7 +164,7 @@ 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
@@ -135,3 +172,4 @@ parameters:
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 44737be9..8258232e 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -68,6 +68,10 @@ 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
+
vm_base_name:
type: string
description: Base name of ONAP VMs
@@ -100,15 +104,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 +122,7 @@ parameters:
openstack_api_key:
type: string
- description: Openstack API Key
+ description: Openstack password or API Key
horizon_url:
type: string
@@ -155,106 +150,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
- description: CLAMP IP Address
-
+ 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
###########################
# #
@@ -302,51 +252,98 @@ 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
- description: CLAMP repository
+ 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
+ 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
+ vnfsdk_branch:
+ type: string
#############
@@ -450,7 +447,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 }
@@ -459,6 +456,7 @@ resources:
__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: |
@@ -476,7 +474,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
@@ -485,6 +483,7 @@ resources:
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
@@ -532,8 +531,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 }
@@ -599,8 +598,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 }
@@ -630,32 +629,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:
@@ -672,11 +671,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
@@ -698,13 +697,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
@@ -743,7 +742,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 }
@@ -811,21 +810,23 @@ resources:
__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 }
@@ -853,13 +854,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
@@ -909,8 +912,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 }
@@ -974,8 +977,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 }
@@ -992,6 +996,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
@@ -1051,8 +1056,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 }
@@ -1120,8 +1125,8 @@ 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 }
__external_dns__: { get_param: external_dns }
__portal_repo__: { get_param: portal_repo }
@@ -1202,8 +1207,8 @@ resources:
__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 }
+ __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 }
@@ -1328,8 +1333,8 @@ resources:
__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: policy_docker }
+ __gerrit_branch__: { get_param: policy_branch }
__cloud_env__: { get_param: cloud_env }
__external_dns__: { get_param: external_dns }
__policy_repo__: { get_param: policy_repo }
@@ -1395,8 +1400,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 }
- __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 }
__appc_repo__: { get_param: appc_repo }
@@ -1414,6 +1420,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 "__external_dns__" > /opt/config/external_dns.txt
echo "__appc_repo__" > /opt/config/remote_repo.txt
@@ -1467,8 +1474,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: clamp_docker }
+ __gerrit_branch__: { get_param: clamp_branch }
__cloud_env__: { get_param: cloud_env }
__external_dns__: { get_param: external_dns }
__clamp_repo__: { get_param: clamp_repo }
@@ -1500,3 +1507,108 @@ resources:
cd /opt
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 }
+ __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 "__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 \ No newline at end of file
diff --git a/heat/ONAP/onap_openstack_float.env b/heat/ONAP/onap_openstack_float.env
index bbc70199..4b7e9f4f 100644
--- a/heat/ONAP/onap_openstack_float.env
+++ b/heat/ONAP/onap_openstack_float.env
@@ -24,6 +24,8 @@ parameters:
flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
+ flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
+
vm_base_name: vm1
key_name: onap_key
@@ -42,10 +44,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
@@ -71,6 +69,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 +83,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
@@ -93,11 +92,10 @@ parameters:
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
@@ -108,7 +106,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
@@ -117,6 +115,7 @@ parameters:
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
###########################
# #
@@ -138,6 +137,45 @@ 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-STAGING-latest
+ policy_docker: 1.1-STAGING-latest
+ portal_docker: 1.1-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
+ dgbuilder_docker: 0.1-STAGING-latest
+
#####################
# #
# ONAP repositories #
@@ -147,7 +185,7 @@ 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
@@ -155,3 +193,4 @@ parameters:
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 f6affeb4..438be715 100644
--- a/heat/ONAP/onap_openstack_float.yaml
+++ b/heat/ONAP/onap_openstack_float.yaml
@@ -44,14 +44,6 @@ parameters:
type: string
description: Public network for floating IP address allocation
- public_subnet_id:
- type: string
- description: Public network subnet id
-
- router_gateway_ip:
- type: string
- description: Public network gateway IP address
-
ubuntu_1404_image:
type: string
description: Name of the Ubuntu 14.04 image
@@ -76,6 +68,10 @@ 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
+
vm_base_name:
type: string
description: Base name of ONAP VMs
@@ -108,15 +104,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 +122,7 @@ parameters:
openstack_api_key:
type: string
- description: Openstack API Key
+ description: Openstack password or API Key
horizon_url:
type: string
@@ -149,6 +136,7 @@ parameters:
type: string
description: Cloud Provider Name
+
######################
# #
# Network parameters #
@@ -163,163 +151,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
-
clamp_float_ip:
type: string
- description: CLAMP Floating IP Address
-
- ### Private IP addresses ###
- oam_network_cidr:
+ openo_float_ip:
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
- description: CLAMP IP Address
+ openo_ip_addr:
+ type: string
###########################
@@ -368,51 +287,98 @@ 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
- description: CLAMP repository
+ 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
+ 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
+ vnfsdk_branch:
+ type: string
#############
@@ -520,7 +486,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 }
@@ -529,6 +495,7 @@ resources:
__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: |
@@ -546,7 +513,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
@@ -555,6 +522,7 @@ resources:
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
@@ -603,9 +571,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: |
@@ -671,9 +639,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: |
@@ -702,33 +670,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:
@@ -745,11 +713,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
@@ -771,13 +739,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
@@ -817,7 +785,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 }
@@ -886,20 +854,22 @@ resources:
__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 }
@@ -928,13 +898,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
@@ -985,8 +957,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 }
@@ -1051,8 +1023,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 }
@@ -1069,6 +1042,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
@@ -1129,8 +1103,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 }
@@ -1199,8 +1173,8 @@ 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 }
__external_dns__: { get_param: external_dns }
__portal_repo__: { get_param: portal_repo }
@@ -1282,8 +1256,8 @@ resources:
__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 }
+ __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 }
@@ -1409,8 +1383,8 @@ resources:
__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: policy_docker }
+ __gerrit_branch__: { get_param: policy_branch }
__cloud_env__: { get_param: cloud_env }
__external_dns__: { get_param: external_dns }
__policy_repo__: { get_param: policy_repo }
@@ -1477,8 +1451,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 }
- __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 }
__appc_repo__: { get_param: appc_repo }
@@ -1496,6 +1471,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 "__external_dns__" > /opt/config/external_dns.txt
echo "__appc_repo__" > /opt/config/remote_repo.txt
@@ -1550,8 +1526,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: clamp_docker }
+ __gerrit_branch__: { get_param: clamp_branch }
__cloud_env__: { get_param: cloud_env }
__external_dns__: { get_param: external_dns }
__clamp_repo__: { get_param: clamp_repo }
@@ -1583,3 +1559,109 @@ resources:
cd /opt
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: onap_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 }
+ __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 "__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 \ No newline at end of file
diff --git a/heat/ONAP/onap_openstack_nofloat.env b/heat/ONAP/onap_openstack_nofloat.env
index 1ef3c753..086eced4 100644
--- a/heat/ONAP/onap_openstack_nofloat.env
+++ b/heat/ONAP/onap_openstack_nofloat.env
@@ -20,6 +20,8 @@ parameters:
flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
+ flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
+
vm_base_name: vm1
key_name: onap_key
@@ -38,10 +40,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
@@ -66,8 +64,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 +78,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
@@ -87,7 +87,7 @@ parameters:
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
###########################
# #
@@ -110,6 +110,44 @@ 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-STAGING-latest
+ policy_docker: 1.1-STAGING-latest
+ portal_docker: 1.1-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
+ dgbuilder_docker: 0.1-STAGING-latest
+
#####################
# #
# ONAP repositories #
@@ -119,7 +157,7 @@ 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
@@ -127,3 +165,4 @@ parameters:
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 fe860d32..0d857ce2 100644
--- a/heat/ONAP/onap_openstack_nofloat.yaml
+++ b/heat/ONAP/onap_openstack_nofloat.yaml
@@ -68,6 +68,10 @@ 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
+
vm_base_name:
type: string
description: Base name of ONAP VMs
@@ -100,15 +104,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 +122,7 @@ parameters:
openstack_api_key:
type: string
- description: Openstack API Key
+ description: Openstack password or API Key
horizon_url:
type: string
@@ -151,87 +146,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
- description: CLAMP IP Address
-
+ openo_ip_addr:
+ type: string
###########################
# #
@@ -279,51 +239,98 @@ 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
- description: CLAMP repository
+ 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
+ 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
+ vnfsdk_branch:
+ type: string
#############
@@ -409,7 +416,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 }
@@ -418,6 +425,7 @@ resources:
__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: |
@@ -435,7 +443,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
@@ -444,6 +452,7 @@ resources:
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
@@ -488,8 +497,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 }
@@ -554,8 +563,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 }
@@ -587,27 +596,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:
@@ -624,13 +633,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
@@ -641,7 +650,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
@@ -654,13 +663,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
@@ -696,7 +705,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 }
@@ -763,20 +772,22 @@ resources:
__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 }
@@ -807,13 +818,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
@@ -860,8 +873,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 }
@@ -924,8 +937,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 }
@@ -944,6 +958,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
@@ -999,8 +1014,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 }
@@ -1065,8 +1080,8 @@ 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 }
__external_dns__: { get_param: external_dns }
__portal_repo__: { get_param: portal_repo }
@@ -1144,8 +1159,8 @@ resources:
__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 }
+ __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 }
@@ -1255,8 +1270,8 @@ resources:
__policy_ip_addr__: { get_param: policy_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: policy_docker }
+ __gerrit_branch__: { get_param: policy_branch }
__cloud_env__: { get_param: cloud_env }
__external_dns__: { get_param: external_dns }
__policy_repo__: { get_param: policy_repo }
@@ -1320,8 +1335,9 @@ resources:
__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 }
__appc_repo__: { get_param: appc_repo }
@@ -1341,6 +1357,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 "__external_dns__" > /opt/config/external_dns.txt
echo "__appc_repo__" > /opt/config/remote_repo.txt
@@ -1391,8 +1408,8 @@ resources:
__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 }
__clamp_repo__: { get_param: clamp_repo }
@@ -1426,3 +1443,103 @@ resources:
cd /opt
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 }
+ __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 "__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
diff --git a/heat/ONAP/onap_rackspace.env b/heat/ONAP/onap_rackspace.env
index 5c82a47f..d92b3c71 100644
--- a/heat/ONAP/onap_rackspace.env
+++ b/heat/ONAP/onap_rackspace.env
@@ -32,10 +32,6 @@ parameters:
artifacts_version: 1.1.0-SNAPSHOT
- docker_version: 1.1-STAGING-latest
-
- gerrit_branch: master
-
cloud_env: rackspace
@@ -66,17 +62,13 @@ 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
@@ -84,3 +76,30 @@ parameters:
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.1-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
diff --git a/heat/ONAP/onap_rackspace.yaml b/heat/ONAP/onap_rackspace.yaml
index b7afe140..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
@@ -159,55 +151,83 @@ 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
- description: CLAMP repository
+
+ 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:
@@ -338,8 +358,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: |
@@ -407,8 +427,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: |
@@ -436,27 +456,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:
@@ -470,10 +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 }
- __mso_repo__: { get_param: mso_repo }
+ __so_repo__: { get_param: so_repo }
template: |
#!/bin/bash
@@ -492,13 +512,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
@@ -531,7 +551,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: |
@@ -592,8 +612,8 @@ resources:
__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: |
@@ -620,13 +640,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
@@ -669,8 +690,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: |
@@ -726,8 +747,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: |
@@ -743,6 +765,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
@@ -808,8 +831,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: |
@@ -877,8 +900,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: portal_docker }
+ __gerrit_branch__: { get_param: portal_branch }
__cloud_env__: { get_param: cloud_env }
__portal_repo__: { get_param: portal_repo }
template: |
@@ -947,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 }
@@ -1050,8 +1073,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: |
@@ -1108,8 +1131,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: |
@@ -1126,6 +1150,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
@@ -1170,8 +1195,8 @@ resources:
__openstack_api_key__: { get_param: openstack_api_key }
__dmaap_topic__: { get_param: dmaap_topic }
__artifacts_version__: { get_param: artifacts_version }
- __docker_version__: { get_param: docker_version }
- __gerrit_branch__: { get_param: gerrit_branch }
+ __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: |