Merge "Populate vnc_api_lib.ini on compute nodes with OpenContrail"

[apex-tripleo-heat-templates.git] / puppet / swift-storage.yaml

diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index c414d8e..9eb6631 100644 (file)
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -27,6 +27,11 @@ parameters:
     description: Mapping of service_name -> network name. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
   Hostname:
     type: string
     default: '' # Defaults to Heat created hostname
@@ -312,6 +317,7 @@ outputs:
           STORAGE_MGMTIP STORAGE_MGMTHOST.DOMAIN STORAGE_MGMTHOST
           TENANTIP TENANTHOST.DOMAIN TENANTHOST
           MANAGEMENTIP MANAGEMENTHOST.DOMAIN MANAGEMENTHOST
+          CTLPLANEIP CTLPLANEHOST.DOMAIN CTLPLANEHOST
         params:
           PRIMARYIP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ObjectStorageHostnameResolveNetwork]}]}
           DOMAIN: {get_param: CloudDomain}
@@ -352,6 +358,12 @@ outputs:
             - '.'
             - - {get_attr: [SwiftStorage, name]}
               - management
+          CTLPLANEIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
+          CTLPLANEHOST:
+            list_join:
+            - '.'
+            - - {get_attr: [SwiftStorage, name]}
+              - ctlplane
   nova_server_resource:
     description: Heat resource handle for the swift storage server
     value: