Merge "Fixed bug in vbrg install script here document"

[demo.git] / heat / ONAP / onap_openstack_nofloat.yaml

diff --git a/heat/ONAP/onap_openstack_nofloat.yaml b/heat/ONAP/onap_openstack_nofloat.yaml
index 054e7c6..136b160 100644 (file)
--- a/heat/ONAP/onap_openstack_nofloat.yaml
+++ b/heat/ONAP/onap_openstack_nofloat.yaml
@@ -3,7 +3,7 @@
 #==================LICENSE_START==========================================
 # 
 #
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -318,8 +318,12 @@ parameters:
     type: string
   uui_docker:
     type: string
+  esr_docker:
+    type: string
   dgbuilder_docker:
     type: string
+  cli_docker:
+    type: string
 
   aai_branch:
     type: string
@@ -1111,6 +1115,7 @@ resources:
             __docker_version__: { get_param: portal_docker }
             __gerrit_branch__: { get_param: portal_branch }
             __cloud_env__: { get_param: cloud_env }
+            __cli_docker__: { get_param: cli_docker }
             __external_dns__: { get_param: external_dns }
             __portal_repo__: { get_param: portal_repo }
           template: |
@@ -1128,6 +1133,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 "__cli_docker__" > /opt/config/cli_docker_version.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
             echo "__portal_repo__" > /opt/config/remote_repo.txt
@@ -1527,6 +1533,7 @@ resources:
             __mvim_docker__: { get_param: mvim_docker }
             __vfc_docker__: { get_param: vfc_docker }
             __uui_docker__: { get_param: uui_docker }
+            __esr_docker__: { get_param: esr_docker }
             __vnfsdk_repo__: { get_param: vnfsdk_repo }
           template: |
             #!/bin/bash
@@ -1547,6 +1554,7 @@ resources:
             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 "__esr_docker__" > /opt/config/esr_docker.txt
             echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt
 
             # Create env file with the IP address of all ONAP components
@@ -1580,12 +1588,6 @@ resources:
       network: { get_resource: oam_onap }
       fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}]
 
-  dcae_c_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: dcae_c_private_port }
-
   dcae_c_vm:
     type: OS::Nova::Server
     properties:
@@ -1598,6 +1600,7 @@ resources:
             base: { get_param: vm_base_name }
       key_name: { get_resource: dcae_vm_key }
       networks:
+        - network: { get_param: public_net_id }
         - port: { get_resource: dcae_c_private_port }
       user_data_format: RAW
       user_data: