Merge "Flatten the role task includes"

tasks/install.yml

@@ -1,18 +0,0 @@
----
-# Copyright 2016, Logan Vig <logan2211@gmail.com>
-#
-# 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.
-
-- include: pre_install.yml
-
-- include: "install_{{ pip_offline_install | ternary('offline', 'online') }}.yml"

tasks/install_offline.yml

@@ -95,5 +95,3 @@
 - name: Set source install pip_get_pip_options
   set_fact:
     pip_source_install_options: "--no-index --find-links={{ pip_tmp_packages | quote }}"
-
-- include: install_source.yml

tasks/install_online.yml

@@ -41,5 +41,3 @@
       delay: 2
       tags:
         - pip-install-script
-
-- include: install_source.yml

tasks/main.yml

@@ -28,6 +28,14 @@
   tags:
     - pip_install-install
 
-- include: install.yml
+- include: pre_install.yml
+  tags:
+    - pip_install-install
+
+- include: "install_{{ pip_offline_install | ternary('offline', 'online') }}.yml"
+  tags:
+    - pip_install-install
+
+- include: install_source.yml
   tags:
     - pip_install-install