summaryrefslogtreecommitdiffstats
path: root/heat
diff options
context:
space:
mode:
Diffstat (limited to 'heat')
-rw-r--r--heat/OAM-Network/network.yaml17
-rw-r--r--heat/ONAP/onap_openstack.env24
-rw-r--r--heat/ONAP/onap_openstack.yaml91
-rw-r--r--heat/ONAP/onap_openstack_template.env4
4 files changed, 106 insertions, 30 deletions
diff --git a/heat/OAM-Network/network.yaml b/heat/OAM-Network/network.yaml
new file mode 100644
index 00000000..cdfb2d79
--- /dev/null
+++ b/heat/OAM-Network/network.yaml
@@ -0,0 +1,17 @@
+heat_template_version: 2013-05-23
+
+resources:
+
+ # ONAP management private network
+ oam_onap:
+ type: OS::Neutron::Net
+ properties:
+ name: oam_onap_vnf_test
+
+ oam_onap_subnet:
+ type: OS::Neutron::Subnet
+ properties:
+ name: oam_onap_vnf_test
+ network_id: { get_resource: oam_onap }
+ cidr: 10.0.0.0/16
+ enable_dhcp: false
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 5c12403b..e8866af1 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -92,6 +92,7 @@ parameters:
music_ip_addr: 10.0.15.1
oof_ip_addr: 10.0.16.1
aaf_ip_addr: 10.0.13.1
+ sms_ip_addr: 10.0.13.2
nbi_ip_addr: 10.0.17.1
###########################
@@ -135,13 +136,14 @@ parameters:
music_branch: master
nbi_branch: master
aaf_branch: master
+ sms_branch: master
oof_branch: master
aai_docker: 1.2-STAGING-latest
aai_sparky_docker: 1.2-STAGING-latest
appc_docker: 1.3.0-SNAPSHOT-latest
so_docker: 1.2.1
- policy_docker: 1.2.0
+ policy_docker: v1.2.0
portal_docker: 2.1-STAGING-latest
robot_docker: 1.2-STAGING-latest
sdc_docker: 1.2-STAGING-latest
@@ -149,7 +151,7 @@ parameters:
vid_docker: 1.2.1
clamp_docker: 2.0-STAGING-latest
msb_docker: 1.1.0-STAGING-latest
- mvim_docker: 1.1.0-SNAPSHOT
+ mvim_docker: 1.1.2-SNAPSHOT
mvim_openstack_docker: 1.1.2-SNAPSHOT
uui_docker: 1.1.0-SNAPSHOT-STAGING-latest
esr_docker: 1.1.0-SNAPSHOT
@@ -159,6 +161,7 @@ parameters:
music_docker: latest
oof_docker: latest
aaf_docker: 2.1.0-SNAPSHOT
+ sms_docker: latest
nbi_docker: latest
dbcl_docker: latest
@@ -178,8 +181,8 @@ parameters:
dcae_sch_docker: latest
dcae_heartbeat_docker: latest
dcae_prh_docker: latest
- holmes_rm_docker: v1.0.0
- holmes_em_docker: v1.0.0
+ holmes_rm_docker: latest
+ holmes_em_docker: latest
vfc_nokia_docker: 1.1.0-STAGING-latest
vfc_nokiav2_docker: 1.1.0-STAGING-latest
@@ -199,16 +202,6 @@ parameters:
vfc_wfengine_activiti_docker: latest
vfc_multivimproxy_docker: 1.0.0-STAGING-latest
- ############################################
- # #
- # Parameters used by Nokia v2 SVNFM driver #
- # #
- ############################################
-
- cbam_username: onapUsername #PUT USERNAME REGISTERED INTO THE NOKIA VNFM, LEAVE AS IS IF NOT USING NOKIA SVNFM
- cbam_password: onapPassword #PUT PASSWORD REGISTERED INTO THE NOKIA VNFM, LEAVE AS IS IF NOT USING NOKIA SVNFM
- cbam_ip: kuku #PUT THE NOKIA VNFM IP ADDRESS HERE, LEAVE AS IS IF NOT USING NOKIA SVNFM
-
#####################
# #
# ONAP repositories #
@@ -216,7 +209,7 @@ parameters:
#####################
aai_repo: http://gerrit.onap.org/r/aai/test-config
appc_repo: http://gerrit.onap.org/r/appc/deployment.git
- mr_repo: http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git
+ mr_repo: http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.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
@@ -229,4 +222,5 @@ parameters:
music_repo: http://gerrit.onap.org/r/music.git
nbi_repo: http://gerrit.onap.org/r/externalapi/nbi.git
aaf_repo: http://gerrit.onap.org/r/aaf/authz.git
+ sms_repo: http://gerrit.onap.org/r/aaf/sms.git
oof_repo: http://gerrit.onap.org/r/optf/has.git
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index c9b51727..ddc5dd0e 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -207,6 +207,8 @@ parameters:
type: string
aaf_ip_addr:
type: string
+ sms_ip_addr:
+ type: string
nbi_ip_addr:
type: string
@@ -300,6 +302,8 @@ parameters:
type: string
aaf_repo:
type: string
+ sms_repo:
+ type: string
oof_repo:
type: string
@@ -426,6 +430,8 @@ parameters:
type: string
aaf_docker:
type: string
+ sms_docker:
+ type: string
nbi_docker:
type: string
dbcl_docker:
@@ -466,13 +472,6 @@ parameters:
vfc_multivimproxy_docker:
type: string
- cbam_username:
- type: string
- cbam_password:
- type: string
- cbam_ip:
- type: string
-
aai_branch:
type: string
appc_branch:
@@ -503,6 +502,8 @@ parameters:
type: string
aaf_branch:
type: string
+ sms_branch:
+ type: string
oof_branch:
type: string
@@ -649,6 +650,7 @@ resources:
__music_ip_addr__: { get_param: music_ip_addr }
__oof_ip_addr__: { get_param: oof_ip_addr }
__aaf_ip_addr__: { get_param: aaf_ip_addr }
+ __sms_ip_addr__: { get_param: sms_ip_addr }
__nbi_ip_addr__: { get_param: nbi_ip_addr }
__cloud_env__: { get_param: cloud_env }
__external_dns__: { get_param: external_dns }
@@ -680,6 +682,7 @@ resources:
echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt
echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt
echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt
+ echo "__sms_ip_addr__" > /opt/config/sms_ip_addr.txt
echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt
echo "__external_dns__" > /opt/config/external_dns.txt
echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt
@@ -1686,9 +1689,6 @@ resources:
__vnfsdk_repo__: { get_param: vnfsdk_repo }
__vfc_nokia_docker__: { get_param: vfc_nokia_docker }
__vfc_nokiav2_docker__: { get_param: vfc_nokiav2_docker }
- __cbam_ip__: { get_param: cbam_ip }
- __cbam_username__: { get_param: cbam_username }
- __cbam_password__: { get_param: cbam_password }
__vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
__vfc_multivimproxy_docker__: { get_param: vfc_multivimproxy_docker }
__vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker }
@@ -1725,9 +1725,6 @@ resources:
echo "__uui_docker__" > /opt/config/uui_docker.txt
echo "__esr_docker__" > /opt/config/esr_docker.txt
echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt
- echo "__cbam_ip__" > /opt/config/cbam_ip.txt
- echo "__cbam_username__" > /opt/config/cbam_username.txt
- echo "__cbam_password__" > /opt/config/cbam_password.txt
echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt
echo "export NOKIAV2_DOCKER_VER=__vfc_nokiav2_docker__" >> /opt/config/vfc_docker.txt
@@ -2185,6 +2182,74 @@ resources:
chmod +x aaf_install.sh
./aaf_install.sh
+ # SMS instantiation
+ sms_private_port:
+ type: OS::Neutron::Port
+ properties:
+ network: { get_resource: oam_onap }
+ fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: sms_ip_addr }}]
+ security_groups:
+ - { get_resource: onap_sg }
+
+ sms_floating_ip:
+ type: OS::Neutron::FloatingIP
+ properties:
+ floating_network_id: { get_param: public_net_id }
+ port_id: { get_resource: sms_private_port }
+
+ sms_vm:
+ type: OS::Nova::Server
+ properties:
+ image: { get_param: ubuntu_1604_image }
+ flavor: { get_param: flavor_medium }
+ name:
+ str_replace:
+ template: base-sms
+ params:
+ base: { get_param: vm_base_name }
+ key_name: { get_resource: vm_key }
+ networks:
+ - port: { get_resource: sms_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 }
+ __docker_version__: { get_param: sms_docker }
+ __cloud_env__: { get_param: cloud_env }
+ __external_dns__: { get_param: external_dns }
+ __sms_repo__: { get_param: sms_repo }
+ __gerrit_branch__: { get_param: sms_branch }
+ __local_ip__: { get_param: sms_ip_addr }
+ 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 "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+ echo "__docker_version__" > /opt/config/docker_version.txt
+ echo "__cloud_env__" > /opt/config/cloud_env.txt
+ echo "__external_dns__" > /opt/config/external_dns.txt
+ echo "__sms_repo__" > /opt/config/remote_repo.txt
+ echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+ echo "__local_ip__" > /opt/config/local_ip.txt
+
+ # Download and run install script
+ curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sms_install.sh -o /opt/sms_install.sh
+ cd /opt
+ chmod +x sms_install.sh
+ ./sms_install.sh
+
# NBI instantiation
nbi_private_port:
type: OS::Neutron::Port
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index b81cc67f..6b11df00 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -150,7 +150,7 @@ parameters:
clamp_docker: ${CLAMP_DOCKER}
msb_docker: ${MSB_APIGATEWAY_DOCKER}
mvim_docker: ${FRAMEWORK_DOCKER}
- mvim_openstack_docker: ${MC_OPENSTACK_DOCKER}
+ mvim_openstack_docker: ${OPENSTACK_OCATA_DOCKER}
uui_docker: ${USECASE_UI_SERVER_DOCKER}
esr_docker: ${ESR_SERVER_DOCKER}
sdc_wfd_docker: ${SDC_WORKFLOW_DESIGNER_DOCKER}
@@ -160,7 +160,7 @@ parameters:
oof_docker: ${OOF_DOCKER}
aaf_docker: ${AAF_DOCKER}
nbi_docker: ${NBI_DOCKER}
- dbcl_docker: ${DBCL_DOCKER}
+ dbcl_docker: ${BUSCONTROLLER_DOCKER}
dcae_docker: ${BOOTSTRAP_DOCKER}
dcae_snmptrap_docker: ${SNMPTRAP_DOCKER}