From 4652d3505a75593535372dcb866616c1692d3276 Mon Sep 17 00:00:00 2001 From: holta Date: Fri, 24 May 2019 03:26:21 -0400 Subject: [PATCH] @holta --- roles/0-init/tasks/hostname.yml | 4 ++-- roles/0-init/tasks/main.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/0-init/tasks/hostname.yml b/roles/0-init/tasks/hostname.yml index 289b5a66e..603b280e1 100644 --- a/roles/0-init/tasks/hostname.yml +++ b/roles/0-init/tasks/hostname.yml @@ -13,7 +13,7 @@ - name: 'Turn the crank for systemd: hostnamectl set-hostname "{{ iiab_hostname }}.{{ iiab_domain }}" (debuntu)' shell: hostnamectl set-hostname "{{ iiab_hostname }}.{{ iiab_domain }}" - when: is_debuntu + when: is_debuntu | bool - name: Install /etc/sysconfig/network from template (redhat) template: @@ -22,7 +22,7 @@ owner: root group: root mode: 0644 - when: is_redhat + when: is_redhat | bool - name: Put hostnames "127.0.0.1 localhost.localdomain localhost box {{ iiab_hostname }}" in /etc/hosts lineinfile: diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml index a16a68a29..fe8f9a1e1 100644 --- a/roles/0-init/tasks/main.yml +++ b/roles/0-init/tasks/main.yml @@ -14,7 +14,7 @@ # sections once and only once to preserve the install date and git hash. - name: Create IIAB directory structure and {{ iiab_ini_file }}, if first_run include_tasks: first_run.yml - when: first_run + when: first_run | bool #- name: Loading computed_vars # include_tasks: roles/0-init/tasks/computed_vars.yml @@ -92,7 +92,7 @@ - name: Set port 443 for Admin Console if adm_cons_force_ssl set_fact: gui_port: 443 - when: adm_cons_force_ssl + when: adm_cons_force_ssl | bool - name: Turn on both vars for MySQL (mandatory in Stage 3!) set_fact: @@ -127,12 +127,12 @@ - name: "Set python_path: /lib/python2.7/site-packages/ (redhat)" set_fact: python_path: /lib/python2.7/site-packages/ - when: is_redhat + when: is_redhat | bool - name: "Set python_path: /usr/local/lib/python2.7/dist-packages/ (debuntu)" set_fact: python_path: /usr/local/lib/python2.7/dist-packages/ - when: is_debuntu + when: is_debuntu | bool # For various reasons the mysql service cannot be enabled on Fedora 20, but # 'mariadb', which is its real name can. On Fedora 18 we need to use 'mysqld'. @@ -154,7 +154,7 @@ #- name: "Set mysql_service: mysql (debuntu)" # set_fact: # mysql_service: mysql -# when: is_debuntu +# when: is_debuntu | bool - name: "Set iiab_fqdn: {{ iiab_hostname }}.{{ iiab_domain }}" set_fact: @@ -168,7 +168,7 @@ - name: Set hostname if FQDN_changed include_tasks: hostname.yml - when: FQDN_changed + when: FQDN_changed | bool - name: Add 'runtime' variable values to {{ iiab_ini_file }} ini_file: