summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-02-20 10:09:35 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-02-27 11:06:39 (GMT)
commit63b3765ed26668b984383f8e464fae39ef54fe32 (patch)
tree041b6bd68a9f6f746bdd71b4befbcd5423d75cf9
parent67e689eb3d83098dc9eb633c4d1ae69eb90f63f8 (diff)
downloaddefinitions-63b3765ed26668b984383f8e464fae39ef54fe32.tar.gz
Upgrade Ansible to v1.8.4 and dependencies
-rw-r--r--strata/ansible.morph31
-rw-r--r--strata/ansible/ansible.morph6
2 files changed, 27 insertions, 10 deletions
diff --git a/strata/ansible.morph b/strata/ansible.morph
index 29ea73e..cceeebd 100644
--- a/strata/ansible.morph
+++ b/strata/ansible.morph
@@ -5,27 +5,40 @@ build-depends:
- morph: strata/core.morph
- morph: strata/python-core.morph
chunks:
+- name: pycrypto
+ morph: strata/openstack-services/pycrypto.morph
+ repo: upstream:python-packages/pycrypto
+ ref: af058ee6f5da391a05275470ab4a4a96aa22b350
+ unpetrify-ref: v2.7a1
+ build-depends: []
+- name: ecdsa
+ repo: upstream:python-packages/ecdsa
+ ref: 36e9cfa80fcf8b53119adc787e54a5892ec1eb2c
+ unpetrify-ref: python-ecdsa-0.11
+ build-depends: []
- name: paramiko
repo: upstream:paramiko
- ref: 951faed80b017e553a27c4cb98f210df44341f8f
- unpetrify-ref: baserock/morph
- build-depends: []
+ ref: 424ba615c2a94d3b059e7f24db1a1093a92d8d22
+ unpetrify-ref: v1.15.2
+ build-depends:
+ - pycrypto
+ - ecdsa
- name: markupsafe
repo: upstream:markupsafe
- ref: 58cde05bdcb0a53d87213b4a5bb605937f178171
- unpetrify-ref: baserock/morph
+ ref: feb1d70c16df62f60dcb521d127fdad8819fc036
+ unpetrify-ref: 0.23
build-depends: []
- name: jinja2
repo: upstream:jinja2
- ref: 91fa138077d9ed5cf73a7903479077498e695492
- unpetrify-ref: baserock/morph
+ ref: 762c612e7276889aac265645da00e62e33d1573c
+ unpetrify-ref: 2.7.3
build-depends:
- markupsafe
- name: ansible
morph: strata/ansible/ansible.morph
repo: upstream:ansible
- ref: aa56db7e28d4fe256471043b05120c2f41a840e5
- unpetrify-ref: baserock/morph
+ ref: ebc8d48d34296fe010096f044e2b7591df37a622
+ unpetrify-ref: baserock/v1.8.4
build-depends:
- paramiko
- jinja2
diff --git a/strata/ansible/ansible.morph b/strata/ansible/ansible.morph
index da434f0..dbc6ec4 100644
--- a/strata/ansible/ansible.morph
+++ b/strata/ansible/ansible.morph
@@ -2,4 +2,8 @@ name: ansible
kind: chunk
build-system: python-distutils
post-install-commands:
-- install -D -m644 ansible.cfg "$DESTDIR/etc/ansible/ansible.cfg"
+- |
+ install -D -m644 /proc/self/fd/0 "$DESTDIR/etc/ansible/ansible.cfg" <<EOF
+ [defaults]
+ log_path=/var/log/ansible
+ EOF