Merge pull request #8 from wcm-io-devops/feature/configurable-dependencies

Introduced variables to enable/disable dependencies, fixed default editor in environment setup, fixed configuration of settings-security.xml when provision an other user than the ssh user.

Author: tobias-richter

README.md

@@ -35,6 +35,22 @@ This role requires Ansible 2.0 or higher.
 
 Available variables are listed below, along with default values.
 
+    controlhost_dependency_maven: true
+
+Enables / disables the maven role dependency.
+
+    controlhost_dependency_java: true
+
+Enables / disables the java role dependency.
+
+    controlhost_dependency_epel: true
+
+Enables / disables the epel role dependency.
+
+    controlhost_dependency_terraform: true
+
+Enables / disables the terraform role dependency.
+
     controlhost_user: "{{ ansible_env.SUDO_USER | default(ansible_env.USER) }}"
 
 The user on the controlhost.

defaults/main.yml

@@ -1,3 +1,15 @@
+# Enables / disables the maven role dependency
+controlhost_dependency_maven: true
+
+# Enables / disables the java role dependency
+controlhost_dependency_java: true
+
+# Enables / disables the epel role dependency
+controlhost_dependency_epel: true
+
+# Enables / disables the terraform role dependency
+controlhost_dependency_terraform: true
+
 # The user on the controlhost
 controlhost_user: "{{ ansible_env.SUDO_USER | default(ansible_env.USER) }}"
 # The users group on the controlhost

meta/main.yml

@@ -28,28 +28,34 @@ dependencies:
         "dependency",
         "dependency.epel"
       ],
-      when: ansible_os_family == 'RedHat'
+      when: [
+          ansible_os_family == 'RedHat',
+          controlhost_dependency_epel
+        ]
   }
   - {
       role: srsp.oracle-java,
       version: 2.19.1,
       tags: [
         "dependency",
         "dependency.java"
-      ]
+      ],
+      when: controlhost_dependency_java
   }
   - {
       role: gantsign.maven,
       version: 4.0.0,
       tags: [
         "dependency",
         "dependency.maven"
-      ]
+      ],
+      when: controlhost_dependency_maven
   }
   - { role: andrewrothstein.terraform,
       version: v2.2.10,
       tags: [
         "dependency",
         "dependency.terraform"
-      ]
+      ],
+      when: controlhost_dependency_terraform
   }

tasks/env/setup.yml

@@ -1,7 +1,7 @@
 - name: "env : setup : Configure default editor"
   blockinfile:
     path: "{{ controlhost_bashrc }}"
-    block: "export EDITOR={{ controlhost_bashrc_editor }}"
+    block: "export EDITOR={{ controlhost_default_editor }}"
     marker: "# {mark} editor ANSIBLE MANAGED BLOCK"
   when: controlhost_default_editor is defined
 

tasks/maven/encrypt_password.yml

@@ -1,9 +1,10 @@
 - name: "Maven : encrypt_password : Encrpyt maven server password when maven master password is defined."
   block:
   - name: "Maven : encrypt_password : encrypt maven server password"
-    shell: "mvn --encrypt-password {{ item.password }}"
+    command: "mvn --encrypt-password {{ item.password }}"
     register: _maven_encrypted_server_password
     become_user: "{{ controlhost_user }}"
+    become: yes
     no_log: true
 
   - name: "Maven : encrypt_password : set password fact for server with id : {{ item.id}}"

tasks/maven/setup.yml

@@ -14,7 +14,7 @@
 - name: "Maven : setup: Configure settings-security.xml"
   block:
   - name: "Maven : setup : create maven master password"
-    shell: "mvn --encrypt-master-password {{ controlhost_maven_master_password }}"
+    command: "mvn --encrypt-master-password {{ controlhost_maven_master_password }}"
     no_log: true
     register: _maven_master_password_result
 
@@ -31,7 +31,6 @@
       group: "{{ controlhost_group }}"
       mode: 0640
 
-  become_user: "{{ controlhost_user }}"
   when:
     - _maven_settings_security_stats.stat.exists == false
     - controlhost_maven_master_password is defined

tasks/packages/pip.yml

@@ -3,6 +3,8 @@
     name: "pip"
     state: latest
   when: controlhost_packages_pip_upgrade
+  tags:
+    - skip_ansible_lint
 
 - name: "packages : pip : Install required PIP packages."
   pip: