From 547b84d53527d9298deee52ab7097045afdca01b Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Mon, 12 Dec 2016 15:52:23 -0600 Subject: [PATCH 1/2] adds the infrastructure-playbooks dir to the rpm packaging Signed-off-by: Andrew Schoen --- ceph-ansible.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceph-ansible.spec.in b/ceph-ansible.spec.in index 8bba4d4ab..6e91f68bc 100644 --- a/ceph-ansible.spec.in +++ b/ceph-ansible.spec.in @@ -31,7 +31,7 @@ Ansible playbooks for Ceph %install mkdir -p %{buildroot}%{_datarootdir}/ceph-ansible -for f in ansible.cfg *.yml *.sample group_vars roles library plugins; do +for f in ansible.cfg *.yml *.sample group_vars roles library plugins infrastructure-playbooks; do cp -a $f %{buildroot}%{_datarootdir}/ceph-ansible done From 3b014df6c00be1be0c9b194f6eb9aec10ff38086 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Wed, 14 Dec 2016 09:13:55 -0600 Subject: [PATCH 2/2] ensure site.yml.sample always gathers facts and installs python2 Then avoids an issue where if you're using tags to run the playbook then no facts are gathered, resulting in subsequent tasks failing that depend on them. Signed-off-by: Andrew Schoen --- site.yml.sample | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site.yml.sample b/site.yml.sample index 0d1ecc3bc..437f5ed2c 100644 --- a/site.yml.sample +++ b/site.yml.sample @@ -13,6 +13,8 @@ - clients - iscsigws gather_facts: false + tags: + - always tasks: # If we can't get python2 installed before any module is used we will fail # so just try what we can to get it installed