X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fconfig%2Fdocker%2Finit%2Fsrc%2Fconfig%2Fdcaegen2%2Fheat%2Fonap_dcae.yaml;h=1a07ef2bdb7f78a6d787f8c818ca01a0c841af78;hb=refs%2Fheads%2Famsterdam;hp=31a81169a69dd348b29c31972b04b4714d459f98;hpb=9df729a94661a298020ee2778f92dea0f539f3b5;p=oom.git

diff --git a/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.yaml b/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.yaml
index 31a81169a6..1a07ef2bdb 100644
--- a/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.yaml
+++ b/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.yaml
@@ -315,6 +315,8 @@ resources:
     properties:
       network: { get_resource: oam_onap }
       fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
 
   dcae_c_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -389,20 +391,68 @@ resources:
             __dcaeos_dnsaas_username__: { get_param: dnsaas_username }
             __dcaeos_dnsaas_password__: { get_param: dnsaas_password }
             # fixed private IPs
-            __mr_ip_addr__: { get_param: mr_k8s_ip_addr }
-            __policy_ip_addr__: { get_param: policy_k8s_ip_addr }
-            __sdc_ip_addr__: { get_param: sdc_k8s_ip_addr }
-            __openo_ip_addr__: { get_param: openo_k8s_ip_addr }
-            __aai1_ip_addr__: { get_param: aai1_k8s_ip_addr }
-            __aai2_ip_addr__: { get_param: aai2_k8s_ip_addr }
+            __mr_ip_addr__:
+              str_replace:
+                template: { get_param: mr_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __policy_ip_addr__:
+              str_replace:
+                template: { get_param: policy_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __sdc_ip_addr__:
+              str_replace:
+                template: { get_param: sdc_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __openo_ip_addr__:
+              str_replace:
+                template: { get_param: openo_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __aai1_ip_addr__:
+              str_replace:
+                template: { get_param: aai1_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __aai2_ip_addr__:
+              str_replace:
+                template: { get_param: aai2_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
             # floating IPs
             __dns_floating_ip_addr__: { get_param: dns_ip_addr }
-            __aai1_floating_ip_addr__: { get_param: aai1_k8s_ip_addr }
-            __aai2_floating_ip_addr__: { get_param: aai1_k8s_ip_addr }
-            __mrouter_floating_ip_addr__: { get_param: mr_k8s_ip_addr }
-            __sdc_floating_ip_addr__: { get_param: sdc_k8s_ip_addr }
-            __policy_floating_ip_addr__: { get_param: policy_k8s_ip_addr }
-            __openo_floating_ip_addr__: { get_param: openo_k8s_ip_addr }
+            __aai1_floating_ip_addr__:
+              str_replace:
+                template: { get_param: aai1_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __aai2_floating_ip_addr__:
+              str_replace:
+                template: { get_param: aai1_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __mrouter_floating_ip_addr__:
+              str_replace:
+                template: { get_param: mr_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __sdc_floating_ip_addr__:
+              str_replace:
+                template: { get_param: sdc_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __policy_floating_ip_addr__:
+              str_replace:
+                template: { get_param: policy_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
+            __openo_floating_ip_addr__:
+              str_replace:
+                template: { get_param: openo_k8s_ip_addr }
+                params:
+                  __rand_str__: { get_resource: random-str }
             __dcae_c_floating_ip_addr__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
 
           template: |
@@ -480,4 +530,7 @@ resources:
 outputs:
   dcae_floating_ip:
     description: DCAE Boostrap container external IP Address
-    value: { get_attr: [ dcae_c_floating_ip, floating_ip_address ] }
\ No newline at end of file
+    value: { get_attr: [ dcae_c_floating_ip, floating_ip_address ] }
+  random_string:
+    description: Random generated string identifing this deployment
+    value: {get_attr: [random-str, value]}
\ No newline at end of file