Fix network config in DCAE GEN2 VM

Change-Id: I6e4cf47cbf92c471f3b8e6a05c58d636198f2af4
Issue-ID: INT-213
Signed-off-by: Marco Platania <platania@research.att.com>

diff --git a/heat/ONAP/onap_openstack_nofloat.yaml b/heat/ONAP/onap_openstack_nofloat.yaml
index f48a80b..697770b 100644 (file)
--- a/heat/ONAP/onap_openstack_nofloat.yaml
+++ b/heat/ONAP/onap_openstack_nofloat.yaml
@@ -1584,12 +1584,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:
@@ -1602,6 +1596,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: