Merge pull request #26 from sean-m-sullivan/ocp_testing

Updated to remove become and a python env
redhat-cop · Dec 18, 2020 · 04e0aff · 04e0aff
2 parents d240b7b + f8b1d6c
commit 04e0aff
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/roles/install_ocp/defaults/main.yml b/roles/install_ocp/defaults/main.yml
@@ -16,6 +16,9 @@ tower_ocp_setup_file: ansible-tower-openshift-setup-{{ tower_release_version }}.
 tower_admin_user: "admin"
 tower_admin_password: "password"
 
+# Tower Install Verbosity
+tower_verbose_install: false
+
 # Tower secret key
 tower_secret_key: "mysecret"
 

diff --git a/roles/install_ocp/tasks/install_ocp.yml b/roles/install_ocp/tasks/install_ocp.yml
@@ -49,8 +49,8 @@
 
     # Run the Setup
     - name: "[Tower] Run the Ansible Tower Setup Program"
-      become: true
-      command: ./setup_openshift.sh -e "openshift_token={{ openshift_token }}"
+      command: |
+            ./setup_openshift.sh -e "openshift_token={{ openshift_token }}" {% if tower_verbose_install %}-- -vvv{% endif %}
       args:
         chdir: "{{ tower_setup_dir }}"
       async: 10000

diff --git a/roles/install_ocp/templates/inventory.j2 b/roles/install_ocp/templates/inventory.j2
@@ -1,4 +1,4 @@
-localhost ansible_connection=local ansible_python_interpreter="/usr/bin/env python"
+localhost ansible_connection=local
 
 [all:vars]