X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Ftime%2Fntp.yaml;h=88ab90cb41e0063676324d643601489ac5dd82c9;hb=7dbd771a35e06bf1601e10c5d92e4b18955ce958;hp=dbef6f91232a5c2f2c3457499cb825d1cbe5d4c1;hpb=a47d580018625d1b6363228f4254ded317c2091e;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/time/ntp.yaml b/puppet/services/time/ntp.yaml
index dbef6f91..88ab90cb 100644
--- a/puppet/services/time/ntp.yaml
+++ b/puppet/services/time/ntp.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   NTP service deployment using puppet, this YAML file
@@ -7,12 +7,21 @@ description: >
   and configure NTP.
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  NtpServers:
+  NtpServer:
     default: []
     description: NTP servers
     type: comma_delimited_list
@@ -21,7 +30,12 @@ outputs:
   role_data:
     description: Role ntp using composable services.
     value:
+      service_name: ntp
       config_settings:
-        ntp::ntpservers: {get_param: NtpServers}
+        ntp::servers: {get_param: NtpServer}
+        tripleo.ntp.firewall_rules:
+          '105 ntp':
+            dport: 123
+            proto: udp
       step_config: |
-        include ::ntp
\ No newline at end of file
+        include ::tripleo::profile::base::time::ntp