Merge pull request #1004 from analbeard/master

Debian installation: fix Ansible compilation and correct syntax for Ansible v2
pull/1006/head
Leseb 2016-10-04 16:25:46 +02:00 committed by GitHub
commit a1a908848e
2 changed files with 5 additions and 4 deletions

View File

@ -42,6 +42,7 @@ if [[ "Debian" =~ $os_VENDOR ]]; then
pip install PyYAML jinja2 paramiko pip install PyYAML jinja2 paramiko
git clone https://github.com/ansible/ansible.git git clone https://github.com/ansible/ansible.git
cd ansible cd ansible
git submodule update --init --recursive
make install make install
mkdir /etc/ansible mkdir /etc/ansible
elif [[ "Ubuntu" =~ $os_VENDOR || "LinuxMint" =~ $os_VENDOR ]]; then elif [[ "Ubuntu" =~ $os_VENDOR || "LinuxMint" =~ $os_VENDOR ]]; then

View File

@ -1,11 +1,11 @@
--- ---
- name: install dependencies - name: install dependencies
apt: apt:
pkg: "{{ item }}" name: "{{ item }}"
state: present state: present
update_cache: yes update_cache: yes
cache_valid_time: 3600 cache_valid_time: 3600
with_items: debian_package_dependencies with_items: "{{debian_package_dependencies}}"
- name: configure ceph apt repository - name: configure ceph apt repository
include: debian_ceph_repository.yml include: debian_ceph_repository.yml
@ -13,10 +13,10 @@
- name: install ceph - name: install ceph
apt: apt:
pkg: "{{ item }}" name: "{{ item }}"
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
default_release: "{{ ceph_stable_release_uca | default(ansible_distribution_release) }}{{ '-backports' if ceph_origin == 'distro' and ceph_use_distro_backports else ''}}" default_release: "{{ ceph_stable_release_uca | default(ansible_distribution_release) }}{{ '-backports' if ceph_origin == 'distro' and ceph_use_distro_backports else ''}}"
with_items: debian_ceph_packages with_items: "{{debian_ceph_packages}}"
- name: install ceph-test - name: install ceph-test
apt: apt: