Variables cannot be uppercased

Author: vmcj

Diff for: icpc-wf/ansible/admin.yml

@@ -86,13 +86,13 @@
 
     - name: Update repo URL based on network
       set_fact:
-        DJ_GIT_REPO_SCRIPTS: "{{ DJ_GIT_REPO_SCRIPTS_RESTRICTED if WF_RESTRICTED_NETWORK else DJ_GIT_REPO_SCRIPTS }}"
+        dj_git_repo_scripts: "{{ DJ_GIT_REPO_SCRIPTS_RESTRICTED if WF_RESTRICTED_NETWORK else DJ_GIT_REPO_SCRIPTS }}"
 
     - name: create working copy of the domjudge-scripts repo
       become: true
       become_user: domjudge
       # We use a different directory here to have one single 'upstream' and not have issues with it
-      git: repo={{ DJ_GIT_REPO_SCRIPTS }} dest=/home/domjudge/domjudge-scripts-checkout version=main accept_hostkey=yes update=no
+      git: repo={{ dj_git_repo_scripts }} dest=/home/domjudge/domjudge-scripts-checkout version=main accept_hostkey=yes update=no
 
     - name: create working copy of the wf2020 repo
       become: true

Diff for: icpc-wf/ansible/roles/domjudge_checkout/tasks/main.yml

@@ -11,12 +11,12 @@
 
 - name: Update repo URL based on network
   set_fact:
-    DJ_GIT_REPO: "{{ DJ_GIT_REPO_RESTRICTED if WF_RESTRICTED_NETWORK else DJ_GIT_REPO }}"
+    dj_git_repo: "{{ DJ_GIT_REPO_RESTRICTED if WF_RESTRICTED_NETWORK else DJ_GIT_REPO }}"
 
 - name: Create working copy of the domjudge repo
   become: true
   become_user: domjudge
-  git: repo={{ DJ_GIT_REPO }} dest={{ DJ_DIR }} version={{ DJ_BRANCH }} accept_hostkey=yes update=yes
+  git: repo={{ dj_git_repo }} dest={{ DJ_DIR }} version={{ DJ_BRANCH }} accept_hostkey=yes update=yes
   register: git_working_copy
 
 - name: Check composer dependencies present

Diff for: icpc-wf/ansible/roles/grafana/defaults/main.yml

@@ -1,2 +1,2 @@
 grafana_port: 8443
-LOKI: false
+loki: false

Diff for: icpc-wf/ansible/roles/grafana/tasks/main.yml

@@ -37,7 +37,7 @@
     remote_src: true
     owner: domjudge
     group: domjudge
-  when: LOKI
+  when: loki
 
 - name: Dir for loki settings
   file:
@@ -46,7 +46,7 @@
     owner: root
     group: root
     mode: 0755
-  when: LOKI
+  when: loki
 
 - name: Set loki settings
   copy:
@@ -55,23 +55,23 @@
     owner: root
     group: root
     mode: 0644
-  when: LOKI
+  when: loki
   notify: restart loki
 
 - name: Setup loki systemd
   copy:
     src: loki.service
     dest: /etc/systemd/system/
     mode: 0655
-  when: LOKI
+  when: loki
   notify: restart loki
 
 - name: Start loki service
   service:
     name: loki
     state: started
     enabled: true
-  when: LOKI
+  when: loki
 
 ## Setup grafana
 - name: Install grafana

Diff for: icpc-wf/ansible/roles/grafana/templates/nginx.conf.j2

@@ -10,7 +10,7 @@ server {
       proxy_read_timeout  90;
     }
 
-{% if LOKI %}
+{% if loki %}
     location /loki/ {
        proxy_set_header X-Forwarded-Proto https;
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

Diff for: icpc-wf/ansible/roles/judgedaemon/tasks/main.yml

@@ -3,7 +3,7 @@
 
 - name: create domjudge-run users
   user: name=domjudge-run-{{ item }} createhome=no home=/nonexistent group=nogroup shell=/bin/false
-  loop: "{{ CPUCORE }}"
+  loop: "{{ cpucore }}"
 
 - name: create domjudge-run group
   group: name=domjudge-run state=present
@@ -30,7 +30,7 @@
 
 - name: Pre-generate the kernel flags for ansible usage
   set_fact:
-    procline: "cgroup_enable=memory swapaccount=1 isolcpus={{ CPUCORE|join(',') }}"
+    procline: "cgroup_enable=memory swapaccount=1 isolcpus={{ cpucore|join(',') }}"
 
 - name: add cgroup kernel parameters
   lineinfile:

Diff for: icpc-wf/ansible/roles/judgedaemon/vars/main.yml

@@ -1,4 +1,4 @@
-CPUCORE:
+cpucore:
   - 2
 # Add additional CPU cores to pin judgedaemons on as:
 # - 3

Diff for: icpc-wf/ansible/roles/prometheus_target_all/defaults/main.yml

@@ -1 +1 @@
-PROM: true
+prom: true

Diff for: icpc-wf/ansible/roles/prometheus_target_all/tasks/main.yml

@@ -15,7 +15,7 @@
     remote_src: true
     owner: domjudge
     group: domjudge
-  when: PROM
+  when: prom
 
 - name: Dir for promtail settings
   file:
@@ -24,7 +24,7 @@
     owner: root
     group: root
     mode: 0755
-  when: PROM
+  when: prom
 
 - name: Set promtail settings
   copy:
@@ -33,7 +33,7 @@
     owner: root
     group: root
     mode: 0644
-  when: PROM
+  when: prom
   notify: restart promtail
 
 - name: Setup promtail systemd
@@ -43,12 +43,12 @@
     mode: 0655
     owner: root
     group: root
-  when: PROM
+  when: prom
   notify: restart promtail
 
 - name: Start promtail service
   service:
     name: promtail
     state: started
     enabled: true
-  when: PROM
+  when: prom