Merge "Adding heat based deployment for sms"

2 files changed, 83 insertions, 1 deletions

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 5c11425f..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,6 +136,7 @@ parameters:
   music_branch: master
   nbi_branch: master
   aaf_branch: master
+  sms_branch: master
   oof_branch: master
 
   aai_docker: 1.2-STAGING-latest
@@ -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
 
@@ -206,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
@@ -219,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 83efdea7..27fdca50 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:
@@ -496,6 +502,8 @@ parameters:
     type: string
   aaf_branch:
     type: string
+  sms_branch:
+    type: string
   oof_branch:
     type: string
 
@@ -642,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 }
@@ -673,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
@@ -2168,6 +2178,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