Merge changes from topics 'YARDSTICK-1250', 'YARDSTICK-1249'

* changes:
  Fix pip install issues in install.yaml script
  Bump ansible version to 2.5.5

1 files changed, 0 insertions, 23 deletions

diff --git a/ansible/roles/install_yardstick/tasks/regular_install.yml b/ansible/roles/install_yardstick/tasks/regular_install.yml
deleted file mode 100644
index cd0e86fb9..000000000
--- a/ansible/roles/install_yardstick/tasks/regular_install.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2018 Intel Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
----
-- name: Install Yardstick requirements
-  pip:
-    requirements: "{{ yardstick_dir }}/requirements.txt"
-
-- name: Install Yardstick code
-  pip:
-    name: "."
-    extra_args: -e
-    chdir: "{{ yardstick_dir }}/"