Updated role using Multi-Distro framework
* The default apt packages have been moved into a var file that is only loaded when the detected OS is matched. * The Install task file has had the apt specific tasks moved into a named install task file. Change-Id: Id352021c2c4a989eb93cdaa3804b2d363cd9f8bd
This commit is contained in:
parent
e4e53e81d2
commit
651a11d5a0
@ -17,8 +17,6 @@
|
||||
debug: False
|
||||
verbose: True
|
||||
|
||||
## APT Cache options
|
||||
cache_timeout: 600
|
||||
|
||||
glance_git_repo: https://git.openstack.org/openstack/glance
|
||||
glance_git_install_branch: master
|
||||
@ -181,12 +179,6 @@ glance_rbd_store_chunk_size: 8
|
||||
|
||||
glance_service_in_ldap: false
|
||||
|
||||
# Common apt packages
|
||||
glance_apt_packages:
|
||||
- rpcbind
|
||||
- rsync
|
||||
- git
|
||||
- nfs-common
|
||||
|
||||
# Cinder packages that must be installed before anything else
|
||||
glance_requires_pip_packages:
|
||||
|
@ -30,7 +30,9 @@ galaxy_info:
|
||||
- development
|
||||
- openstack
|
||||
dependencies:
|
||||
- apt_package_pinning
|
||||
- role: apt_package_pinning
|
||||
when:
|
||||
- ansible_pkg_mgr == 'apt'
|
||||
- galera_client
|
||||
- openstack_openrc
|
||||
- role: pip_lock_down
|
||||
|
@ -13,21 +13,11 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
|
||||
#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
|
||||
#in 1.9.x or we move to 2.0 (if tested working)
|
||||
- name: Check apt last update file
|
||||
stat:
|
||||
path: /var/cache/apt
|
||||
register: apt_cache_stat
|
||||
tags:
|
||||
- glance-apt-packages
|
||||
|
||||
- name: Update apt if needed
|
||||
apt:
|
||||
update_cache: yes
|
||||
when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
|
||||
- include: glance_install_apt.yml
|
||||
when:
|
||||
- ansible_pkg_mgr == 'apt'
|
||||
tags:
|
||||
- glance-install
|
||||
- glance-apt-packages
|
||||
|
||||
- name: Create developer mode constraint file
|
||||
@ -74,18 +64,6 @@
|
||||
- glance-install
|
||||
- glance-pip-packages
|
||||
|
||||
- name: Install apt packages
|
||||
apt:
|
||||
pkg: "{{ item }}"
|
||||
state: latest
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: glance_apt_packages
|
||||
tags:
|
||||
- glance-install
|
||||
- glance-apt-packages
|
||||
|
||||
- name: Install requires pip packages
|
||||
pip:
|
||||
|
37
tasks/glance_install_apt.yml
Normal file
37
tasks/glance_install_apt.yml
Normal file
@ -0,0 +1,37 @@
|
||||
# Copyright 2016, 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.
|
||||
|
||||
#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
|
||||
#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
|
||||
#in 1.9.x or we move to 2.0 (if tested working)
|
||||
|
||||
- name: Check apt last update file
|
||||
stat:
|
||||
path: /var/cache/apt
|
||||
register: apt_cache_stat
|
||||
|
||||
- name: Update apt if needed
|
||||
apt:
|
||||
update_cache: yes
|
||||
when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
|
||||
|
||||
- name: Install apt packages
|
||||
apt:
|
||||
pkg: "{{ item }}"
|
||||
state: latest
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: glance_apt_packages
|
@ -13,6 +13,15 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- name: Gather variables for each operating system
|
||||
include_vars: "{{ item }}"
|
||||
with_first_found:
|
||||
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
|
||||
- "{{ ansible_distribution | lower }}.yml"
|
||||
- "{{ ansible_os_family | lower }}.yml"
|
||||
tags:
|
||||
- always
|
||||
|
||||
- include: glance_pre_install.yml
|
||||
- include: glance_install.yml
|
||||
- include: glance_post_install.yml
|
||||
|
23
vars/ubuntu-14.04.yml
Normal file
23
vars/ubuntu-14.04.yml
Normal file
@ -0,0 +1,23 @@
|
||||
# Copyright 2016, 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.
|
||||
|
||||
## APT Cache options
|
||||
cache_timeout: 600
|
||||
|
||||
# Common apt packages
|
||||
glance_apt_packages:
|
||||
- rpcbind
|
||||
- rsync
|
||||
- git
|
||||
- nfs-common
|
Loading…
x
Reference in New Issue
Block a user