Browse Source

Merge pull request #2153 from tbielawa/shell_comp2

Move the bash completion into the cli role. Only add when not contain…
Scott Dodson 8 years ago
parent
commit
faf5618ec4
2 changed files with 4 additions and 3 deletions
  1. 4 0
      roles/openshift_cli/tasks/main.yml
  2. 0 3
      roles/openshift_master/tasks/main.yml

+ 4 - 0
roles/openshift_cli/tasks/main.yml

@@ -25,3 +25,7 @@
     - /usr/local/bin/oc
     - /usr/local/bin/kubectl
   when: openshift.common.is_containerized | bool
+
+- name: Install bash completion for oc tools
+  action: "{{ ansible_pkg_mgr }} name=bash-completion state=present"
+  when: not openshift.common.is_containerized | bool

+ 0 - 3
roles/openshift_master/tasks/main.yml

@@ -27,9 +27,6 @@
   action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-master{{ openshift_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }} state=present"
   when: not openshift.common.is_containerized | bool
 
-- name: Install bash completion for oc tools
-  action: "{{ ansible_pkg_mgr }} name=bash-completion state=present"
-
 - name: Pull master image
   command: >
     docker pull {{ openshift.master.master_image }}{{ ':' + openshift_version if openshift_version is defined and openshift_version != '' else '' }}