Remove AAI dependency on SDC form Heat

Change-Id: I92b34360849518cff3dc904564e732836396cfd5
Signed-off-by: Marco Platania <platania@research.att.com>

diff --git a/heat/OpenECOMP/onap_openstack_RC.yaml b/heat/OpenECOMP/onap_openstack_RC.yaml
index 6ec6f7a..6a296d2 100644 (file)
--- a/heat/OpenECOMP/onap_openstack_RC.yaml
+++ b/heat/OpenECOMP/onap_openstack_RC.yaml
@@ -298,12 +298,12 @@ resources:
   vm_key:
     type: OS::Nova::KeyPair
     properties:
-      name: 
+      name:
         str_replace:
           template: base_rand
           params:
             base: { get_param: key_name }
-            rand: { get_resource: random-str }         
+            rand: { get_resource: random-str }
       public_key: { get_param: pub_key }
       save_private_key: false
 
@@ -312,7 +312,7 @@ resources:
   oam_ecomp:
     type: OS::Neutron::Net
     properties:
-      name: 
+      name:
         str_replace:
           template: oam_ecomp_rand
           params:
@@ -321,7 +321,7 @@ resources:
   oam_ecomp_subnet:
     type: OS::Neutron::Subnet
     properties:
-      name: 
+      name:
         str_replace:
           template: oam_ecomp_rand
           params:
@@ -438,7 +438,6 @@ resources:
 
   aai_vm:
     type: OS::Nova::Server
-    depends_on: sdc_vm
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_xlarge }
@@ -534,7 +533,7 @@ resources:
             #!/bin/bash
 
             # Create configuration files
-            mkdir -p /opt/config            
+            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
@@ -984,7 +983,7 @@ resources:
       networks:
         - port: { get_resource: dcae_c_private_port }
       user_data_format: RAW
-      user_data: 
+      user_data:
         str_replace:
           params:
             __nexus_repo__: { get_param: nexus_repo }

diff --git a/heat/OpenECOMP/onap_rackspace_RC.yaml b/heat/OpenECOMP/onap_rackspace_RC.yaml
index a53eaf0..317023e 100644 (file)
--- a/heat/OpenECOMP/onap_rackspace_RC.yaml
+++ b/heat/OpenECOMP/onap_rackspace_RC.yaml
@@ -131,12 +131,12 @@ resources:
   vm_key:
     type: OS::Nova::KeyPair
     properties:
-      name: 
+      name:
         str_replace:
           template: base_rand
           params:
             base: { get_param: key_name }
-            rand: { get_resource: random-str }         
+            rand: { get_resource: random-str }
       public_key: { get_param: pub_key }
       save_private_key: false
 
@@ -145,7 +145,7 @@ resources:
   oam_ecomp:
     type: OS::Neutron::Net
     properties:
-      name: 
+      name:
         str_replace:
           template: oam_ecomp_rand
           params:
@@ -154,7 +154,7 @@ resources:
   oam_ecomp_subnet:
     type: OS::Neutron::Subnet
     properties:
-      name: 
+      name:
         str_replace:
           template: oam_ecomp_rand
           params:
@@ -220,7 +220,6 @@ resources:
 
   aai_vm:
     type: OS::Nova::Server
-    depends_on: sdc_vm
     properties:
       flavor: 15 GB Compute v1
       name: vm1-aai
@@ -302,7 +301,7 @@ resources:
             #!/bin/bash
 
             # Create configuration files
-            mkdir -p /opt/config            
+            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
@@ -379,7 +378,7 @@ resources:
     properties:
       network: { get_resource: oam_ecomp }
       fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.10.1}]
- 
+
   robot_vm:
     type: OS::Nova::Server
     properties:
@@ -692,7 +691,7 @@ resources:
         - network: { get_param: public_net_id }
         - port: { get_resource: dcae_c_private_port }
       user_data_format: RAW
-      user_data: 
+      user_data:
         str_replace:
           params:
             __nexus_repo__: { get_param: nexus_repo }