From 30c7fe36d4cd80b8282cec4240b18dc6efffdf67 Mon Sep 17 00:00:00 2001 From: Simon Weald Date: Tue, 4 Oct 2016 15:02:25 +0100 Subject: [PATCH 1/2] fixed installation on Debian Jessie --- install-ansible.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install-ansible.sh b/install-ansible.sh index 35ce37e2b..b9a6e86d9 100755 --- a/install-ansible.sh +++ b/install-ansible.sh @@ -42,6 +42,7 @@ if [[ "Debian" =~ $os_VENDOR ]]; then pip install PyYAML jinja2 paramiko git clone https://github.com/ansible/ansible.git cd ansible + git submodule update --init --recursive make install mkdir /etc/ansible elif [[ "Ubuntu" =~ $os_VENDOR || "LinuxMint" =~ $os_VENDOR ]]; then From e160edd881042049fd59fd1f1fe9be28aa88d432 Mon Sep 17 00:00:00 2001 From: Simon Weald Date: Tue, 4 Oct 2016 15:04:15 +0100 Subject: [PATCH 2/2] updated Debian package installation syntax for Ansible v2 --- roles/ceph-common/tasks/installs/install_on_debian.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/ceph-common/tasks/installs/install_on_debian.yml b/roles/ceph-common/tasks/installs/install_on_debian.yml index a15b6ec75..63e75393e 100644 --- a/roles/ceph-common/tasks/installs/install_on_debian.yml +++ b/roles/ceph-common/tasks/installs/install_on_debian.yml @@ -1,11 +1,11 @@ --- - name: install dependencies apt: - pkg: "{{ item }}" + name: "{{ item }}" state: present update_cache: yes cache_valid_time: 3600 - with_items: debian_package_dependencies + with_items: "{{debian_package_dependencies}}" - name: configure ceph apt repository include: debian_ceph_repository.yml @@ -13,10 +13,10 @@ - name: install ceph apt: - pkg: "{{ item }}" + name: "{{ item }}" 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 ''}}" - with_items: debian_ceph_packages + with_items: "{{debian_ceph_packages}}" - name: install ceph-test apt: