Dynamic preload vFWDT

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

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 18ac6d6..3cc01e7 100644 (file)
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -409,6 +409,8 @@ parameters:
     type: string
   dgbuilder_docker:
     type: string
+  ansible_docker:
+    type: string
   cli_docker:
     type: string
   music_docker:
@@ -1492,9 +1494,6 @@ resources:
         - path: /opt/sdc_vm_init.sh
           permissions: '0755'
           content: { get_file: cloud-config/sdc_vm_init.sh }
-        - path: /opt/sdc_wfd_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/sdc_wfd_vm_init.sh }
         - path: /etc/init.d/serv.sh
           permissions: '0755'
           content:
@@ -1756,6 +1755,7 @@ resources:
               __docker_version__: { get_param: appc_docker }
               __gerrit_branch__: { get_param: appc_branch }
               __dgbuilder_docker__: { get_param: dgbuilder_docker }
+              __ansible_docker__: { get_param: ansible_docker }
               __appc_repo__: { get_param: appc_repo }
             template: |
               #!/bin/bash
@@ -1765,6 +1765,7 @@ resources:
               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 "__ansible_docker__" > /opt/config/ansible_version.txt
               echo "__appc_repo__" > /opt/config/remote_repo.txt
 
               cd /opt
@@ -1790,7 +1791,7 @@ resources:
     type: OS::Nova::Server
     properties:
       image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_medium }
+      flavor: { get_param: flavor_large }
       name:
         str_replace:
           template: base-clamp