minor cleanups for info-beamer role

3 files changed, 20 insertions, 11 deletions

diff --git a/inventory/host_vars/ele-infobeamer-emc.yml b/inventory/host_vars/ele-infobeamer-emc.yml
index 73de2458..4cfbaef9 100644
--- a/inventory/host_vars/ele-infobeamer-emc.yml
+++ b/inventory/host_vars/ele-infobeamer-emc.yml
@@ -1,2 +1,2 @@
 ---
-info_beamer_tvservice: "{{ info_beamer_tvservices['1080i50'] }}"
+info_beamer_tvservice: "{{ info_beamer_tvservices['1080p25'] }}"
diff --git a/roles/info-beamer/config/defaults/main.yml b/roles/info-beamer/config/defaults/main.yml
index 0b684d0b..93be6d5d 100644
--- a/roles/info-beamer/config/defaults/main.yml
+++ b/roles/info-beamer/config/defaults/main.yml
@@ -45,3 +45,7 @@ info_beamer_feature_flags:
 # info_beamer_branding_video: ""
 
 # info_beamer_device_connect_key: ""
+
+# info_beamer_scaling_governor: powersave
+info_beamer_scaling_governor: ondemand
+# info_beamer_scaling_governor: porformance
diff --git a/roles/info-beamer/config/tasks/main.yml b/roles/info-beamer/config/tasks/main.yml
index 209af83d..cb493317 100644
--- a/roles/info-beamer/config/tasks/main.yml
+++ b/roles/info-beamer/config/tasks/main.yml
@@ -15,24 +15,25 @@
     state: directory
 
 - name: configure video output resolution
+  when: info_beamer_tvservice is defined
   copy:
     content: "{{ info_beamer_tvservice }}"
     dest: "{{ info_beamer_base_path }}/config/tvservice"
-  when: info_beamer_tvservice is defined
 
 - name: configure audio output
+  when: info_beamer_audio_target is defined
   copy:
     content: "{{ info_beamer_audio_target }}"
     dest: "{{ info_beamer_base_path }}/config/audio"
-  when: info_beamer_audio_target is defined
 
 - name: configure ssh keys
+  when: info_beamer_ssh_keys is defined
   copy:
     content: "{{ info_beamer_ssh_keys | join('\n') }}"
     dest: "{{ info_beamer_base_path }}/config/authorized_keys"
-  when: info_beamer_ssh_keys is defined
 
 - name: configure wired network interface
+  when: info_beamer_network is defined
   copy:
     content: |
       {{ info_beamer_network.address }}
@@ -40,45 +41,49 @@
       {{ info_beamer_network.gateway }}
       {{ info_beamer_network.dns }}
     dest: "{{ info_beamer_base_path }}/config/network"
-  when: info_beamer_network is defined
 
 - name: configure wireless network interface
+  when: info_beamer_wireless is defined
   copy:
     content: |
       {{ info_beamer_wireless.ssid }}
       {{ info_beamer_wireless.key }}
     dest: "{{ info_beamer_base_path }}/config/wireless"
-  when: info_beamer_wireless is defined
 
 - name: enable info-beamer feature flags
   loop: "{{ info_beamer_feature_flags | dict2items }}"
   loop_control:
     label: "{{ item.key }}({{ item.value }}"
+  when: item.value
   copy:
     content: ""
     dest: "{{ info_beamer_base_path }}/config/{{ item.key }}"
-  when: item.value
+
+- name: configure scaling governor
+  copy:
+    content: "{{ info_beamer_scaling_governor }}"
+    dest: "{{ info_beamer_base_path }}/config/scaling_governor"
 
 - name: install branding logo
+  when: info_beamer_branding_logo is defined
   copy:
     src: "{{ info_beamer_branding_logo }}"
     dest: "{{ info_beamer_base_path }}/config/branding.ppm"
-  when: info_beamer_branding_logo is defined
 
 - name: install branding background
+  when: info_beamer_branding_background is defined
   copy:
     src: "{{ info_beamer_branding_background }}"
     dest: "{{ info_beamer_base_path }}/config/branding.jpg"
-  when: info_beamer_branding_background is defined
 
 - name: install branding video
+  when: info_beamer_branding_video is defined
   copy:
     src: "{{ info_beamer_branding_video }}"
     dest: "{{ info_beamer_base_path }}/config/branding.mp4"
-  when: info_beamer_branding_video is defined
 
 - name: configure device connect key
+  when: info_beamer_device_connect_key is defined
   copy:
     content: "{{ info_beamer_device_connect_key }}"
     dest: "{{ info_beamer_base_path }}/config/device-connect-key.txt"
-  when: info_beamer_device_connect_key is defined