summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Flink <tflink@fedoraproject.org>2017-01-18 07:52:34 +0000
committerTim Flink <tflink@fedoraproject.org>2017-01-18 07:52:34 +0000
commit8691ae4adce4b038a83894eab861d36fb6ef47f3 (patch)
tree567b4b8f129de1293599798370f2517f12176a11
parent9aecb897985d9597f925898887f3998ffc75004c (diff)
downloadansible-8691ae4adce4b038a83894eab861d36fb6ef47f3.tar.gz
ansible-8691ae4adce4b038a83894eab861d36fb6ef47f3.tar.xz
ansible-8691ae4adce4b038a83894eab861d36fb6ef47f3.zip
more cloudinit tweaks to make things work properly
-rw-r--r--roles/taskotron/taskotron-client/templates/settings.py.testcloud.j27
1 files changed, 2 insertions, 5 deletions
diff --git a/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2 b/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2
index 3cf2fe8c0..b0cec2c08 100644
--- a/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2
+++ b/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2
@@ -30,11 +30,6 @@ users:
- {{ buildslave_pubkey }}
write_files:
- encoding: b64
- content: 'W3VwZGF0ZXMtdGVzdGluZ10KbmFtZT1GZWRvcmEgJHJlbGVhc2V2ZXIgLSAkYmFzZWFyY2ggLSBUZXN0IFVwZGF0ZXMKZmFpbG92ZXJtZXRob2Q9cHJpb3JpdHkKYmFzZXVybD1odHRwOi8vaW5mcmFzdHJ1Y3R1cmUuZmVkb3JhcHJvamVjdC5vcmcvcHViL2ZlZG9yYS9saW51eC91cGRhdGVzL3Rlc3RpbmcvJHJlbGVhc2V2ZXIvJGJhc2VhcmNoLwojbWV0YWxpbms9aHR0cHM6Ly9taXJyb3JzLmZlZG9yYXByb2plY3Qub3JnL21ldGFsaW5rP3JlcG89dXBkYXRlcy10ZXN0aW5nLWYkcmVsZWFzZXZlciZhcmNoPSRiYXNlYXJjaAplbmFibGVkPTAKZ3BnY2hlY2s9MQpncGdrZXk9ZmlsZTovLy9ldGMvcGtpL3JwbS1ncGcvUlBNLUdQRy1LRVktZmVkb3JhLSRyZWxlYXNldmVyLSRiYXNlYXJjaAoKW3VwZGF0ZXMtdGVzdGluZy1kZWJ1Z2luZm9dCm5hbWU9RmVkb3JhICRyZWxlYXNldmVyIC0gJGJhc2VhcmNoIC0gVGVzdCBVcGRhdGVzIERlYnVnCmZhaWxvdmVybWV0aG9kPXByaW9yaXR5CmJhc2V1cmw9aHR0cDovL2luZnJhc3RydWN0dXJlLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9mZWRvcmEvbGludXgvdXBkYXRlcy90ZXN0aW5nLyRyZWxlYXNldmVyLyRiYXNlYXJjaC9kZWJ1Zy8KI21ldGFsaW5rPWh0dHBzOi8vbWlycm9ycy5mZWRvcmFwcm9qZWN0Lm9yZy9tZXRhbGluaz9yZXBvPXVwZGF0ZXMtdGVzdGluZy1kZWJ1Zy1mJHJlbGVhc2V2ZXImYXJjaD0kYmFzZWFyY2gKZW5hYmxlZD0wCmdwZ2NoZWNrPTEKZ3Bna2V5PWZpbGU6Ly8vZXRjL3BraS9ycG0tZ3BnL1JQTS1HUEctS0VZLWZlZG9yYS0kcmVsZWFzZXZlci0kYmFzZWFyY2gKClt1cGRhdGVzLXRlc3Rpbmctc291cmNlXQpuYW1lPUZlZG9yYSAkcmVsZWFzZXZlciAtIFRlc3QgVXBkYXRlcyBTb3VyY2UKZmFpbG92ZXJtZXRob2Q9cHJpb3JpdHkKYmFzZXVybD1odHRwOi8vaW5mcmFzdHJ1Y3R1cmUuZmVkb3JhcHJvamVjdC5vcmcvcHViL2ZlZG9yYS9saW51eC91cGRhdGVzL3Rlc3RpbmcvJHJlbGVhc2V2ZXIvU1JQTVMvCiNtZXRhbGluaz1odHRwczovL21pcnJvcnMuZmVkb3JhcHJvamVjdC5vcmcvbWV0YWxpbms/cmVwbz11cGRhdGVzLXRlc3Rpbmctc291cmNlLWYkcmVsZWFzZXZlciZhcmNoPSRiYXNlYXJjaAplbmFibGVkPTAKZ3BnY2hlY2s9MQpncGdrZXk9ZmlsZTovLy9ldGMvcGtpL3JwbS1ncGcvUlBNLUdQRy1LRVktZmVkb3JhLSRyZWxlYXNldmVyLSRiYXNlYXJjaAo='
- owner: root:root
- path: /etc/yum.repos.d/fedora-updates-testing.repo
- permissions: '0644'
- - encoding: b64
content: 'W2luZnJhc3RydWN0dXJlLXRhZ3NdCm5hbWU9RmVkb3JhIEluZnJhc3RydWN0dXJlIHRhZyAkcmVsZWFzZXZlciAtICRiYXNlYXJjaApiYXNldXJsPWh0dHA6Ly9pbmZyYXN0cnVjdHVyZS5mZWRvcmFwcm9qZWN0Lm9yZy9yZXBvL2luZnJhL2YkcmVsZWFzZXZlci1pbmZyYS8kYmFzZWFyY2gvCmVuYWJsZWQ9MQpncGdjaGVjaz0xCmdwZ2tleT1odHRwOi8vaW5mcmFzdHJ1Y3R1cmUuZmVkb3JhcHJvamVjdC5vcmcvcmVwby9pbmZyYS9SUE0tR1BHLUtFWS1JTkZSQS1UQUdTCg=='
owner: root:root
path: /etc/yum.repos.d/infra-tags.repo
@@ -56,6 +51,8 @@ write_files:
path: /etc/yum.repos.d/fedora-updates-testing.repo
permissions: '0644'
{% endif %}
+runcmd:
+ - [dnf, update, libtaskotron, python-resultsdb_api]
"""
#ATOMIC_USER_DATA = """#cloud-config
#password: %s