Closes #881 - Obsolete Service_TEMPLATE and Data_TEMPLATE

config/automation/Speech/High_Wind_Speed_Check.yaml

@@ -18,7 +18,7 @@
 
   action:
     - service: script.notify_engine
-      data_template:
+      data:
         title: 'VERY HIGH WINDS:'
         value1:  >-
           {% set windspeed = states.sensor.dark_sky_wind_speed.state | round %}
@@ -36,7 +36,7 @@
       entity_id: input_boolean.alert_mode
 
     - service: script.speech_engine
-      data_template:
+      data:
         value1: >
           {% set windspeed = states.sensor.dark_sky_wind_speed.state | round %}
           {% if ( windspeed > 25 ) and ( windspeed <= 40 ) %}
@@ -52,7 +52,7 @@
     - service: script.emergency
 
     - service: script.tweet_engine_no_image
-      data_template:
+      data:
         tweet: >
           {% set windspeed = states.sensor.dark_sky_wind_speed.state | round %}
           {% if ( windspeed > 25 ) and ( windspeed <= 40 ) %}

config/automation/Speech/announcements.yaml

@@ -19,7 +19,7 @@
   action:
     # This Group is defined in the groups directory.
     - service: group.set
-      data_template:
+      data:
         object_id: "arriving"
         add_entities: >-
           {{ trigger.to_state.entity_id }}
@@ -32,7 +32,7 @@
 
     - delay: '00:01:00'
     - service: script.speech_engine
-      data_template:
+      data:
 #         {% set person = state_attr(trigger.entity_id, "friendly_name")%}      This is another way to do it.
 #         {% set person = trigger.entity_id.split('.')[1]|replace('_', ' ')%}
         personarriving: >
@@ -81,7 +81,7 @@
         call_window_check: 1
 
     - service: group.set
-      data_template:
+      data:
         object_id: "arriving"
         entities: []
 

config/automation/Speech/door_opened.yaml

@@ -22,7 +22,7 @@
 
   action:
     - service: script.notify_engine
-      data_template:
+      data:
         who: 'parents'
         value1: "The {{ trigger.to_state.attributes.friendly_name }} has been {{ (trigger.to_state.state)|replace('_', ' ') }}."
         apns_id: 'information'
@@ -31,6 +31,6 @@
       entity_id: input_boolean.alert_mode
 
     - service: script.speech_engine
-      data_template:
+      data:
         call_window_check: 1
         call_inside_weather: 1

config/automation/Speech/guest_mode.yaml

@@ -14,7 +14,7 @@
 
   action:
     - service: script.speech_engine
-      data_template:
+      data:
         value1: >
           {{ [
           "Guest Mode has been enabled for the rest of the day.",
@@ -54,7 +54,7 @@
       entity_id:
         - input_boolean.guest_mode
     - service: script.speech_engine
-      data_template:
+      data:
         value1: >
           {{ [
           "Guest Mode has been disabled and normal automations will continue.",

config/automation/Speech/nest.yaml

@@ -19,6 +19,6 @@
 
   action:
     - service: script.speech_engine
-      data_template:
+      data:
         NestStatus: "The {{ trigger.entity_id.split('.')[1].split('_')[0]}} {{ trigger.entity_id.split('.')[1].split('_')[1]}} has now been turned on for {{(trigger.to_state.state)}}."
         call_window_check: 1

config/automation/Speech/new_device.yaml

@@ -13,11 +13,11 @@
         {{ not is_state('media_player.livingroomCC', 'playing') }}
 
     - service: script.speech_engine
-      data_template:
+      data:
         NewDevice: "There has been a new device detected on the network.  Be sure to appropriately catagorize {{trigger.event.data.host_name}} within Circle."
 
     - service: script.tweet_engine_no_image
-      data_template:
+      data:
         tweet: >
           {{ [
           "New Device on the Network! @MeetCircle has alerted me and now it is locked down.",

config/automation/System/CucKoo_Clock.yaml

@@ -2,6 +2,7 @@
 # @CCOSTAN
 # Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
 ## Plays the number of cuckoos per hour and 1 on the half hour.
+# More Info and Video: https://www.vcloudinfo.com/2017/11/building-digital-cuckoo-clock-with-home.html
 #####################################################################
 
 - alias: Cuckoo Clock
@@ -35,7 +36,7 @@
     - wait_template: "{{ not is_state('media_player.livingroomCC', 'playing') }}"
 
     - service: media_player.play_media
-      data_template:
+      data:
         entity_id: >
           {% if states.group.bed.state == 'off' %}
           media_player.livingroomCC

config/automation/System/Self_heal.yaml

@@ -13,7 +13,7 @@
   action:
 
     - service: script.tweet_engine_image
-      data_template:
+      data:
         tweet: >-
           {{ [
           "While they sleep, I self heal the #Z-Wave network with #Wink. (https://github.com/CCOSTAN/Home-AssistantConfig#hubs)",

config/automation/System/Wink_update_notification.yaml

@@ -7,14 +7,14 @@
 
   action:
     - service: script.notify_engine
-      data_template:
+      data:
         value1: 'Check the Wink Hub.  Update is needed.'
         value2: "{{ states.binary_sensor.carlowink.attributes }}"
         value3: ''
         who: 'carlo'
 
     - service: notify.html5
-      data_template:
+      data:
         title: "Wink Update Available"
         message: "Wink Update is available. - {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %d%b%Y', true) }}"
         data:
@@ -27,10 +27,10 @@
         notification_id: "update_available"
 
     - service: ifttt.trigger
-      data_template: {"event":"GitPost", "value1":"Wink Update is available. - {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %d%b%Y', true) }}", "value2":"{{ states.binary_sensor.carlowink.attributes }}"}
+      data: {"event":"GitPost", "value1":"Wink Update is available. - {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %d%b%Y', true) }}", "value2":"{{ states.binary_sensor.carlowink.attributes }}"}
 
     - service: script.tweet_engine_no_image
-      data_template:
+      data:
         tweet: >
           {{ [
           "Check @TheWinkApp Hub @CCostan. Update is needed. {{ states.binary_sensor.carlowink.attributes }}",

config/automation/System/bad_logins.yaml

@@ -10,7 +10,7 @@
 
   action:
     - service: script.notify_engine
-      data_template:
+      data:
         value1: 'Bad Login: '
         value2: 'There was a Hack attempt!'
         value3: 'Go Check the GUI for details.'
@@ -18,7 +18,7 @@
         apns_id: 'information'
 
     - service: script.tweet_engine_image
-      data_template:
+      data:
         tweet: >
           {{ [
           "Seriously, I am a Smart Home. I am logging your hack attempt.",

config/automation/System/detect_and_adjust_lights.yaml

@@ -39,7 +39,7 @@
 
   action:
     - service: light.turn_on
-      data_template:
+      data:
         entity_id: "{{ trigger.event.data.entity_id }}"
         brightness: >
           {% set hour=states("sensor.time").split(':')[0] | int %}

config/automation/System/door_chime.yaml

@@ -22,7 +22,7 @@
         volume_level: 0.22
 
     - service: media_player.play_media
-      data_template:
+      data:
         entity_id: >
           {% if states.group.bed.state == 'off' %}
           media_player.livingroomCC

config/automation/System/ip_change.yaml

@@ -14,7 +14,7 @@
       to: 'True'
   action:
     - service: script.notify_engine
-      data_template:
+      data:
         value1: 'Changed IP address:'
         value2: "New IP: {{ states('sensor.exteral_ip') }}"
         value3: ' - Be sure to Change DNS!'
@@ -22,7 +22,7 @@
         apns_id: 'ip-change'
 
     - service: script.tweet_engine_no_image
-      data_template:
+      data:
         tweet: >
           {{ [
           "That's weird. Looks like my IP address changed. @CCostan, please check it out.",

config/automation/System/rachio_rain_delay.yaml

@@ -31,10 +31,10 @@
 
   action:
     - service: ifttt.trigger
-      data_template: {"event":"Rachio_Rain_Delay"}
+      data: {"event":"Rachio_Rain_Delay"}
 
     - service: script.tweet_engine_image
-      data_template:
+      data:
         tweet: >
           {{ [
           "Looks like Rain, Pausing the @_Rachio for 24 hours. (https://github.com/CCOSTAN/Home-AssistantConfig#landscaping)",

config/automation/System/trigger_dump.yaml

@@ -9,13 +9,13 @@
         event_type: feedreader
     action:
       - service: script.notify_engine
-        data_template:
+        data:
           value1: 'Check the MQTT Dump'
           value2: '/dump/{{ trigger.platform }}'
           who: 'carlo'
           apns_id: 'information'
       - service: mqtt.publish
-        data_template:
+        data:
           topic: '/dump/{{ trigger.platform }}'
           retain: false
           payload: >-

config/automation/System/update_notification.yaml

@@ -15,17 +15,17 @@
 
   action:
     - service: script.notify_engine
-      data_template:
+      data:
         title: 'Home Assistant {{ states.binary_sensor.updater.attributes.newest_version }} '
         value1: "Home Assistant {{ states.binary_sensor.updater.attributes.newest_version }} is now available."
         who: 'carlo'
         apns_id: 'information'
 
     - service: ifttt.trigger
-      data_template: {"event":"GitPost", "value1":"Home Assistant {{ states.binary_sensor.updater.attributes.newest_version }}  is now available.", "value2":"{{ states.binary_sensor.updater.attributes.newest_version }} "}
+      data: {"event":"GitPost", "value1":"Home Assistant {{ states.binary_sensor.updater.attributes.newest_version }}  is now available.", "value2":"{{ states.binary_sensor.updater.attributes.newest_version }} "}
 
     - service: script.tweet_engine_image
-      data_template:
+      data:
         tweet: >-
           {% macro getIntro() %}
            {{- [

config/automation/System/watchdog_light.yaml

@@ -16,7 +16,7 @@
 #Turn it off!
   action:
     - service: homeassistant.turn_off
-      data_template:
+      data:
         entity_id: "{{ trigger.entity_id }}"
 
 - alias: Make it Right WatchDog!
@@ -33,7 +33,7 @@
 #Turn it off!
   action:
     - service: homeassistant.turn_off
-      data_template:
+      data:
         entity_id:
           - switch.front_landscaping
           - switch.back_landscaping

config/automation/Timed_Triggers/2200.yaml

@@ -15,7 +15,7 @@
        {{ not is_state('media_player.whole_house', 'playing') }}
 
     - service: script.speech_engine
-      data_template:
+      data:
         call_no_announcement: 1
         call_garage_check: 1
         call_window_check: 1

config/automation/Timed_Triggers/night_watchdog.yaml

@@ -40,5 +40,5 @@
 
   action:
     - service: switch.turn_off
-      data_template:
+      data:
         entity_id: "{{ trigger.entity_id }}"

config/automation/Timed_Triggers/startup_notification.yaml

@@ -10,7 +10,7 @@
       event: start
   action:
     - service: script.notify_engine
-      data_template:
+      data:
         title: 'Home Assistant StartUp'
         value1: 'Home Assistant is Up and Running!'
         who: 'carlo'
@@ -33,7 +33,7 @@
         payload: "get-status"
 
     - service: group.set
-      data_template:
+      data:
         object_id: "arriving"
         entities: []
 

config/automation/Timed_Triggers/sunrise_turn_off.yaml

@@ -16,7 +16,7 @@
       entity_id:
         - group.landscaping
     - service: script.tweet_engine_image
-      data_template:
+      data:
         tweet: >
           {{ [
           "Even though they are sleeping, I still turn off the outdoor lights before sunrise.",

config/automation/Timed_Triggers/sunset_turn_on.yaml

@@ -19,7 +19,7 @@
   action:
     - delay: '00:{{ (range(1, 20)|random|int) }}:00'
     - service: script.tweet_engine_image
-      data_template:
+      data:
         tweet: >-
           {{ [
           "Right before sunset, I turn on the outdoor lights.",
@@ -65,7 +65,7 @@
     - service: light.turn_on
       entity_id:
         - light.outdoor_bathroom
-      data_template:
+      data:
         brightness: >
           {% if states.group.family.state == 'home' -%}
           10

config/automation/dark_rainy_day.yaml

@@ -62,7 +62,7 @@
         kelvin: 5500
 
     - service: script.speech_engine
-      data_template:
+      data:
         value1: "It is getting a little dark inside the house because of the {{trigger.entity_id.split('_')[2]|replace('precip','rain')|replace('counter','lightning') }} {{trigger.entity_id.split('_')[3]|replace('intensity',' ')}} outside.  I will turn on some extra lights in the living room."
         call_window_check: 1
         call_garage_check: 1

config/automation/late_night_outside_helper.yaml

@@ -33,7 +33,7 @@
         - service: scene.turn_on
           entity_id: scene.tv_time
 
-    - service_template: >
+    - service: >
        {% set hour=states("sensor.time").split(':')[0] | int %}
        {% if hour >= 5 and hour <= 9 and states.group.bed.state == 'on'%}
          switch.turn_off

config/automation/medicine_logger.yaml

@@ -23,13 +23,13 @@
         message: "Took Medicine today."
 
     - service: mqtt.publish
-      data_template:
+      data:
         payload: '{{ states("sensor.date") }}'
         topic: 'dash/medicine/medicine_time'
         retain: true
 
     - service: script.notify_engine
-      data_template:
+      data:
         title: 'Medicine Reminder Completed'
         value1: 'Carlo Took Medicine today.'
         who: 'parents'