X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=network%2Fports%2Fexternal.yaml;h=c33643e75004a1d2ab958a9d0cc9f64e350cce8c;hb=d8aa952a75a4afb38b049aa8bcdd9ad685c8bb14;hp=7624eb9f84b95e7f4b572c68a2b11375bfd5b8c2;hpb=fe2133fa8bfface39bdf132b55b692ac349a85e1;p=apex-tripleo-heat-templates.git

diff --git a/network/ports/external.yaml b/network/ports/external.yaml
index 7624eb9f..c33643e7 100644
--- a/network/ports/external.yaml
+++ b/network/ports/external.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: ocata
 
 description: >
   Creates a port on the external network. The IP address will be chosen
@@ -48,13 +48,14 @@ outputs:
   ip_address:
     description: external network IP
     value: {get_attr: [ExternalPort, fixed_ips, 0, ip_address]}
+  ip_address_uri:
+    description: external network IP (for compatibility with external_v6.yaml)
+    value: {get_attr: [ExternalPort, fixed_ips, 0, ip_address]}
   ip_subnet:
-    # FIXME: this assumes a 2 digit subnet CIDR (need more heat functions?)
     description: IP/Subnet CIDR for the external network IP
     value:
           list_join:
             - ''
             - - {get_attr: [ExternalPort, fixed_ips, 0, ip_address]}
               - '/'
-              - {get_attr: [ExternalPort, subnets, 0, cidr, -2]}
-              - {get_attr: [ExternalPort, subnets, 0, cidr, -1]}
+              - {str_split: ['/', {get_attr: [ExternalPort, subnets, 0, cidr]}, 1]}