Merge "Updated role using Multi-Distro framework"

defaults/main.yml

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-## APT Cache options
-cache_timeout: 600
 
 cinder_git_repo: https://git.openstack.org/openstack/cinder
 cinder_git_install_branch: master

meta/main.yml

@@ -36,6 +36,8 @@ dependencies:
   - role: pip_install
     when:
       - cinder_developer_mode | bool
-  - apt_package_pinning
+  - role: apt_package_pinning
+    when:
+      - ansible_pkg_mgr == 'apt'
   - galera_client
   - openstack_openrc

tasks/cinder_install.yml

@@ -17,7 +17,8 @@
   when:
     - ansible_pkg_mgr == 'apt'
   tags:
-    - install-apt
+    - cinder-install
+    - cinder-apt-packages
 
 - name: Create developer mode constraint file
   copy:

tasks/cinder_install_apt.yml

@@ -20,15 +20,11 @@
   stat:
     path: /var/cache/apt
   register: apt_cache_stat
-  tags:
-    - cinder-apt-packages
 
 - name: Update apt if needed
   apt:
     update_cache: yes
   when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
-  tags:
-    - cinder-apt-packages
 
 - name: Install apt packages
   apt:
@@ -39,9 +35,6 @@
   retries: 5
   delay: 2
   with_items: cinder_apt_packages
-  tags:
-    - cinder-install
-    - cinder-apt-packages
 
 - name: Install apt packages
   apt:
@@ -55,6 +48,3 @@
   when:
     - inventory_hostname in groups['cinder_volume']
     - cinder_backend_lvm_inuse | bool
-  tags:
-    - cinder-install
-    - cinder-apt-packages

vars/ubuntu-14.04.yml

@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+## APT Cache options
+cache_timeout: 600
+
 # Common apt packages
 cinder_apt_packages:
   - libpq-dev