X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fcompute-role.yaml;h=4d77d6d38324f2c73a96378b673f168bdf7f3c20;hb=a1b7af553de02e79f47af4110955e5fc73c385f3;hp=0205d0a64b2103294924834107bc57060cfdaa7b;hpb=ef8bf6379e94ce24cfdb69d51f61bf808b555600;p=apex-tripleo-heat-templates.git

diff --git a/puppet/compute-role.yaml b/puppet/compute-role.yaml
index 0205d0a6..4d77d6d3 100644
--- a/puppet/compute-role.yaml
+++ b/puppet/compute-role.yaml
@@ -114,12 +114,6 @@ parameters:
     type: string
     description: Command which will be run whenever configuration data changes
     default: os-refresh-config --timeout 14400
-  LoggingSources:
-    type: json
-    default: []
-  LoggingGroups:
-    type: comma_delimited_list
-    default: []
 
 resources:
 
@@ -295,8 +289,6 @@ resources:
             compute:
               mapped_data:
                 tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
-                tripleo::profile::base::logging::fluentd::fluentd_sources: {get_param: LoggingSources}
-                tripleo::profile::base::logging::fluentd::fluentd_groups: {get_param: LoggingGroups}
 
   NovaComputeDeployment:
     type: OS::TripleO::SoftwareDeployment
@@ -368,6 +360,51 @@ outputs:
   hostname:
     description: Hostname of the server
     value: {get_attr: [NovaCompute, name]}
+  hostname_map:
+    description: Mapping of network names to hostnames
+    value:
+      external:
+        list_join:
+        - '.'
+        - - {get_attr: [NovaCompute, name]}
+          - external
+          - {get_param: CloudDomain}
+      internal_api:
+        list_join:
+        - '.'
+        - - {get_attr: [NovaCompute, name]}
+          - internalapi
+          - {get_param: CloudDomain}
+      storage:
+        list_join:
+        - '.'
+        - - {get_attr: [NovaCompute, name]}
+          - storage
+          - {get_param: CloudDomain}
+      storage_mgmt:
+        list_join:
+        - '.'
+        - - {get_attr: [NovaCompute, name]}
+          - storagemgmt
+          - {get_param: CloudDomain}
+      tenant:
+        list_join:
+        - '.'
+        - - {get_attr: [NovaCompute, name]}
+          - tenant
+          - {get_param: CloudDomain}
+      management:
+        list_join:
+        - '.'
+        - - {get_attr: [NovaCompute, name]}
+          - management
+          - {get_param: CloudDomain}
+      ctlplane:
+        list_join:
+        - '.'
+        - - {get_attr: [NovaCompute, name]}
+          - ctlplane
+          - {get_param: CloudDomain}
   hosts_entry:
     description: >
       Server's IP address and hostname in the /etc/hosts format