Closes #881 - Obsolete Service_TEMPLATE and Data_TEMPLATE

config/script/amp_settings.yaml

@@ -7,7 +7,7 @@
 amp_settings:
   sequence:
     - service: media_player.volume_set
-      data_template:
+      data:
         entity_id: >-
             {% if media_player | length == 0 %}
               {% set media_player = [

config/script/dog_bark.yaml

@@ -2,7 +2,7 @@
 ###Script to send notifications to the ChromeCast Audios during normal hours and only when we are home! Call like this:
   # action:
     # service: script.dog_bark
-    # data_template:
+    # data:
       # value1: 'Startup: Home Assistant is Up and Running!'
 
 ######################################################################################################
@@ -31,7 +31,7 @@ dog_bark:
     - service: media_player.volume_set
       entity_id:
         - media_player.livingroomCC
-      data_template:
+      data:
         volume_level: >
           {% if now().strftime("%H")|int < 12 and now().strftime("%H")|int > 6%}
           0.45
@@ -42,7 +42,7 @@ dog_bark:
           {% endif %}
 
     - service: media_player.play_media
-      data_template:
+      data:
         entity_id:
           - media_player.livingroomCC
           - media_player.entry_alarm_panel

config/script/emergency.yaml

@@ -22,7 +22,7 @@ emergency:
         flash: long
       # Rachio is already inergrated Natively with Protects to run SPRINKLERS with smoke conditions..
 #    - service: ifttt.trigger
-#      data_template: {"event":"rachio_start_front"}
+#      data: {"event":"rachio_start_front"}
 
       # Turn on All LIGHTS 100% Brightness
     - service: light.turn_on

config/script/monthly_color_scene.yaml

@@ -21,7 +21,7 @@ monthly_color_scene:
       state: 'below_horizon'
 
     - service: scene.turn_on
-      data_template:
+      data:
         entity_id: >
           scene.month_
           {%- if states.sensor.flag.state == "True" -%}

config/script/notify_engine.yaml

@@ -2,7 +2,7 @@
 ###Script to send notifications to IFTTT to notify me on the mobile Phone! Call like this:
   # action:
     # service: script.notify_engine
-    # data_template:
+    # data:
       # title: 'Ios Title'
       # value1: 'Startup: Home Assistant is Up and Running!'
       # value2: "{{ trigger.to_state.state }}"
@@ -26,9 +26,9 @@ notify_engine:
           entity_id: input_boolean.text_notifications
           state: 'on'
     # - service: ifttt.trigger
-    #   data_template: {"event":"notify_engine", "value1":"{{ value1 }}", "value2":"{{ value2 }}", "value3":"{{ value3 }}"}
+    #   data: {"event":"notify_engine", "value1":"{{ value1 }}", "value2":"{{ value2 }}", "value3":"{{ value3 }}"}
 
-    - service_template: >
+    - service: >
           {% if who == 'stacey' %}
             notify.mobile_app_stacey_6s
           {% elif who == 'carlo' %}
@@ -40,7 +40,7 @@ notify_engine:
           {% else %}
             notify.ios_family
           {% endif %}
-      data_template:
+      data:
         title: "{{ title }}"
         message: "{{ value1 }} {{ value2 }} {{ value3 }}"
         data:

config/script/skybell_pressed.yaml

@@ -14,7 +14,7 @@ skybell_pressed:
         message: "Someone Pressed the Doorbell."
 
     - service: script.speech_engine
-      data_template:
+      data:
         value1: >
           {{ [
           "Please check the Front Door.  Someone Pressed the Doorbell.",
@@ -26,7 +26,7 @@ skybell_pressed:
           ] | random }}
 
     - service: script.notify_engine
-      data_template:
+      data:
         title: 'Front DoorBell'
         value1: 'Someone pressed the doorbell'
         who: 'family'
@@ -38,7 +38,7 @@ skybell_pressed:
     - service: script.flash_notify
 
     - service: script.tweet_engine_image
-      data_template:
+      data:
         tweet: >
           {{ [
           "Oh, that tickled. Someone just pressed the @MySkyBell.",

config/script/speech_engine.yaml

@@ -28,7 +28,7 @@ speech_engine:
           state: 'on'
 
     - service: script.speech_processing
-      data_template:
+      data:
         media_player: >-
             {% if media_player | length == 0 %}
               {% set media_player = [

config/script/speech_processing.yaml

@@ -12,7 +12,7 @@ speech_processing:
   mode: queued
   sequence:
     - service: mqtt.publish
-      data_template:
+      data:
         topic: 'polly/lastmsg'
         payload: "This message is from {{ now().strftime('%-I') }}:{{ now().strftime('%M') }} {{ now().strftime('%p') }}. {{ speech_message | truncate(220)}}"
         retain: true
@@ -48,7 +48,7 @@ speech_processing:
       entity_id: switch.lr_amp
 
     - service: media_player.volume_set
-      data_template:
+      data:
         entity_id: >
           {{ media_player }}
         volume_level: >-
@@ -61,7 +61,7 @@ speech_processing:
           {% endif %}
 
     # - service: notify.alexa_media
-    #   data_template:
+    #   data:
     #     data:
     #       type: tts
     #     target: >
@@ -74,7 +74,7 @@ speech_processing:
     #         {{ speech_message }}
 
     - service: tts.amazon_polly_say
-      data_template:
+      data:
         entity_id: media_player.livingroomCC
         message: >-
           <speak>

config/script/speechcons.yaml.disabled

@@ -2,7 +2,7 @@
 ###Script to send notifications to the ChromeCast Audios during normal hours and only when we are home! Call like this:
   # action:
     # service: script.speechcons
-    # data_template:
+    # data:
       # speechcon: 'Bazinga'
 # @CCOSTAN
 # Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
@@ -29,7 +29,7 @@ speechcon:
     - service: media_player.volume_set
       entity_id:
         - media_player.livingroomCC
-      data_template:
+      data:
         volume_level: >
           {% if now().strftime("%H")|int < 12 and now().strftime("%H")|int > 6%}
           0.3
@@ -42,7 +42,7 @@ speechcon:
     - service: media_player.play_media
       entity_id:
         - media_player.LivingRoomCC
-      data_template:
+      data:
         media_content_id: >
           "https://raw.githubusercontent.com/CCOSTAN/Home-AssistantConfig/master/config/sounds/speechcons/{{speechcon}}._TTH_.mp3"
         media_content_type: audio/mp4

config/script/tweet.yaml

@@ -11,19 +11,19 @@
 tweet_engine_image:
    sequence:
     - service: mqtt.publish
-      data_template:
+      data:
         topic: 'ifttt/message'
         payload: >-
           {{ tweet }}
         retain: true
 
-    - service_template: >
+    - service: >
           {% if who == 'ccostan' %}
             notify.ccostan
           {% else %}
             notify.bearstoneha
           {% endif %}
-      data_template:
+      data:
         message: >-
           {{ tweet }} #IOT #SmartHome
         data:
@@ -33,19 +33,19 @@ tweet_engine_image:
 tweet_engine_no_image:
    sequence:
     - service: mqtt.publish
-      data_template:
+      data:
         topic: 'ifttt/message'
         payload: >-
           {{ tweet }}
         retain: true
 
-    - service_template: >
+    - service: >
           {% if who == 'ccostan' %}
             notify.ccostan
           {% else %}
             notify.bearstoneha
           {% endif %}
-      data_template:
+      data:
         message: >-
           {{ tweet }} #IOT #SmartHome
 
@@ -53,7 +53,7 @@ tweet_engine_no_image:
 tweet_engine_random:
    sequence:
     - service: script.tweet_engine_image
-      data_template:
+      data:
         tweet: >-
           {%- macro tweet(topic) -%}
             {% set tweets = {
@@ -285,10 +285,10 @@ tweet_engine_random:
 
 
     # - service: ifttt.trigger
-    #   data_template: {"event":"facebook_tweet", "value1":"{{ tweet }}", "value2":"{{ value2 }}", "value3":"{{ value3 }}"}
+    #   data: {"event":"facebook_tweet", "value1":"{{ tweet }}", "value2":"{{ value2 }}", "value3":"{{ value3 }}"}
 
     # - service: ifttt.trigger
-    #   data_template:
+    #   data:
     #     event: >-
     #       facebook_tweet
     #     value1: >

config/script/tweet_youtube.yaml

@@ -8,7 +8,7 @@
 tweet_youtube_engine_setup:
    sequence:
     - service: script.tweet_engine_image
-      data_template:
+      data:
         who: '{{ who }}'
         tweet: >-
           {%- macro tweet(topic) -%}