From 2f9d7da35f329316feefe89285bb313f96cf78b3 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Fri, 6 May 2016 20:52:29 +0200 Subject: [PATCH] Fix variable initialization detection. --- defaults/main.yml | 24 ++++++++++++------------ tasks/development.yml | 34 +++++++++++++++++++++++++--------- tasks/main.yml | 40 ++++++++++++++++++++-------------------- 3 files changed, 57 insertions(+), 41 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 1686876..331a1bf 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -4,15 +4,15 @@ basesystem_role: workstation # basesystem_arch: [i386|amd64|powerpc] -basesystem_arch: null - -basesystem_task_desktop: null -basesystem_task_development: null -basesystem_task_multimedia: null -basesystem_task_network: null -basesystem_task_office: null -basesystem_task_security: null -basesystem_task_shell: null -basesystem_task_shopping: null -basesystem_task_system: null - +# basesystem_arch: null +# +# basesystem_task_desktop: null +# basesystem_task_development: null +# basesystem_task_multimedia: null +# basesystem_task_network: null +# basesystem_task_office: null +# basesystem_task_security: null +# basesystem_task_shell: null +# basesystem_task_shopping: null +# basesystem_task_system: null +# diff --git a/tasks/development.yml b/tasks/development.yml index 7764c01..f70637e 100644 --- a/tasks/development.yml +++ b/tasks/development.yml @@ -5,33 +5,41 @@ state=present with_items: - manpages-dev - - autoconf - - automake - - build-essential - cmake - configure-debian - - devscripts - git-core - git-flow - mercurial - hg-fast-export - - libtool - meld - mercurial - - opam - screen - subversion - tmux - vim - curl - mercurial + when: basesystem_task_development == true + +- name: "Installing C/C++ development utils" + apt: > + name="{{item}}" + state=present + with_items: + - autoconf + - automake + - build-essential + - cmake + - configure-debian + - devscripts + - libtool - make - binutils - bison - - gcc-5 - - gcc-5-multilib - - clang-3.8 + - gcc + - gcc-multilib when: basesystem_task_development == true + # - clang - name: "Installing desktop development utils" apt: > @@ -46,6 +54,14 @@ - xutils when: (basesystem_task_development == true) and (basesystem_task_desktop == true) +- name: "Installing OCaml language" + apt: > + name="{{item}}" + state=present + with_items: + - opam + when: basesystem_task_development == true + - name: "Installing Haskell language" apt: > name="{{item}}" diff --git a/tasks/main.yml b/tasks/main.yml index 49ab69d..a19b54f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,35 +1,35 @@ --- ## FIXME: check that default values are sane, or fail -- fail: Please set basesystem_arch value to something ... - when: basesystem_arch == null +- fail: msg="Please set basesystem_arch value to something ..." + when: basesystem_arch is undefined -- fail: Please set basesystem_task_desktop to either true or false - when: basesystem_task_desktop == null +- fail: msg="Please set basesystem_task_desktop to either true or false" + when: basesystem_task_desktop is undefined -- fail: Please set basesystem_task_development to either true or false - when: basesystem_task_development == null +- fail: msg="Please set basesystem_task_development to either true or false" + when: basesystem_task_development is undefined -- fail: Please set basesystem_task_multimedia to either true or false - when: basesystem_task_multimedia == null +- fail: msg="Please set basesystem_task_multimedia to either true or false" + when: basesystem_task_multimedia is undefined -- fail: Please set basesystem_task_network to either true or false - when: basesystem_task_network == null +- fail: msg="Please set basesystem_task_network to either true or false" + when: basesystem_task_network is undefined -- fail: Please set basesystem_task_office to either true or false - when: basesystem_task_office == null +- fail: msg="Please set basesystem_task_office to either true or false" + when: basesystem_task_office is undefined -- fail: Please set basesystem_task_security to either true or false - when: basesystem_task_security == null +- fail: msg="Please set basesystem_task_security to either true or false" + when: basesystem_task_security is undefined -- fail: Please set basesystem_task_shell to either true or false - when: basesystem_task_shell == null +- fail: msg="Please set basesystem_task_shell to either true or false" + when: basesystem_task_shell is undefined -- fail: Please set basesystem_task_shopping to either true or false - when: basesystem_task_shopping == null +- fail: msg="Please set basesystem_task_shopping to either true or false" + when: basesystem_task_shopping is undefined -- fail: Please set basesystem_task_system to either true or false - when: basesystem_task_system == null +- fail: msg="Please set basesystem_task_system to either true or false" + when: basesystem_task_system is undefined - template: src=apt_conf_glenuxnet_base.j2