openstack/openstack-ansible-os_cinder
Code Issues Proposed changes

Updated role using Multi-Distro framework

Browse Source 
* Moved APT cache var to ubuntu-14.04 file
* Moved tags from cinder_install_apt.yml since they will be inherited
* Updated meta/main.yml dependencies to include apt_package_pinning
when ansible_pkg_mgr is apt.

Change-Id: I23163f783f3b6bce4b170236c46c163d8068b5e0
This commit is contained in:
Hector I Gonzalez 2016-03-30 14:57:07 -05:00
parent bd2e947e1f
commit 19bc27e893
5 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

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

4
meta/main.yml
View File

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

3
tasks/cinder_install.yml
View File

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

10
tasks/cinder_install_apt.yml
View File

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

3
vars/ubuntu-14.04.yml
View File

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