diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-14 10:24:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-14 10:24:04 -0400 |
| commit | faf5618ec483baa7618f02de91128e8f1eaaa471 (patch) | |
| tree | 49e5f128bae3b0e8db24b5b8cae1705f812aa9ac | |
| parent | 2a662d44477c8215c3754a5b604a1206a6453052 (diff) | |
| parent | 344a7abbb2291cc066a15cc903bb12d617c7dade (diff) | |
| download | openshift-faf5618ec483baa7618f02de91128e8f1eaaa471.tar.gz openshift-faf5618ec483baa7618f02de91128e8f1eaaa471.tar.bz2 openshift-faf5618ec483baa7618f02de91128e8f1eaaa471.tar.xz openshift-faf5618ec483baa7618f02de91128e8f1eaaa471.zip | |
Merge pull request #2153 from tbielawa/shell_comp2
Move the bash completion into the cli role. Only add when not contain…
| -rw-r--r-- | roles/openshift_cli/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml index c0a712513..1cb1e03b9 100644 --- a/roles/openshift_cli/tasks/main.yml +++ b/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 diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index a5f30b603..28faee155 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/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 '' }} |