diff --git a/playbooks/roles/bifrost-ironic-install/tasks/pip_install.yml b/playbooks/roles/bifrost-ironic-install/tasks/pip_install.yml
index 99c988d62..e498f3e52 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/pip_install.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/pip_install.yml
@@ -18,7 +18,7 @@
     name: "{{ package }}"
     state: "{{ state | default(omit) }}"
     version: "{{ version | default(omit) }}"
-    virtualenv: "{{ bifrost_venv_dir if enable_venv else 'undefined' }}"
+    virtualenv: "{{ bifrost_venv_dir if enable_venv else omit }}"
   when: source_install is not defined or source_install == false
 # NOTE (cinerama): We should be able to use the pip module here and
 # possibly merge these two tasks when
diff --git a/scripts/env-setup.sh b/scripts/env-setup.sh
index 0976ab69e..5db64fd21 100755
--- a/scripts/env-setup.sh
+++ b/scripts/env-setup.sh
@@ -30,9 +30,7 @@ if [ -x '/usr/bin/apt-get' ]; then
     fi
     if [ -n "${VENV-}" ]; then
         if ! $(virtualenv --version &>/dev/null); then
-            if $(sudo -H apt-get -y install virtualenv); then
-                sudo -H apt-get -y install python-virtualenv
-            fi
+            sudo -H apt-get -y install python-virtualenv
         fi
     fi
 elif [ -x '/usr/bin/yum' ]; then