From 344a7abbb2291cc066a15cc903bb12d617c7dade Mon Sep 17 00:00:00 2001 From: Tim Bielawa Date: Thu, 14 Jul 2016 10:20:02 -0400 Subject: Move the bash completion into the cli role. Only add when not containerized --- roles/openshift_cli/tasks/main.yml | 4 ++++ roles/openshift_master/tasks/main.yml | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'roles') 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 '' }} -- cgit v1.2.1