From 61ada186a5f7028944b2c03df2b059b3b20d641c Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Thu, 28 Apr 2016 15:05:59 +0000 Subject: [PATCH] taskotron-dev: use automatically built minion images --- .../templates/settings.py.testcloud.j2 | 2 ++ .../taskotron-client/templates/taskotron.yaml.j2 | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2 b/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2 index cb82635555..ca881eae36 100644 --- a/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2 +++ b/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2 @@ -34,6 +34,7 @@ write_files: owner: root:root path: /etc/hosts permissions: '0644' +{% if deployment_type in ['stg', 'prod', 'local'] %} - encoding: b64 content: 'W2ZlZG9yYV0KbmFtZT1GZWRvcmEgJHJlbGVhc2V2ZXIgLSAkYmFzZWFyY2gKZmFpbG92ZXJtZXRob2Q9cHJpb3JpdHkKYmFzZXVybD1odHRwOi8vaW5mcmFzdHJ1Y3R1cmUuZmVkb3JhcHJvamVjdC5vcmcvcHViL2ZlZG9yYS9saW51eC9yZWxlYXNlcy8kcmVsZWFzZXZlci9FdmVyeXRoaW5nLyRiYXNlYXJjaC9vcy8KI21ldGFsaW5rPWh0dHBzOi8vbWlycm9ycy5mZWRvcmFwcm9qZWN0Lm9yZy9tZXRhbGluaz9yZXBvPWZlZG9yYS0kcmVsZWFzZXZlciZhcmNoPSRiYXNlYXJjaAplbmFibGVkPTEKbWV0YWRhdGFfZXhwaXJlPTdkCmdwZ2NoZWNrPTAKZ3Bna2V5PWZpbGU6Ly8vZXRjL3BraS9ycG0tZ3BnL1JQTS1HUEctS0VZLWZlZG9yYS0kcmVsZWFzZXZlci0kYmFzZWFyY2gKCltmZWRvcmEtZGVidWdpbmZvXQpuYW1lPUZlZG9yYSAkcmVsZWFzZXZlciAtICRiYXNlYXJjaCAtIERlYnVnCmZhaWxvdmVybWV0aG9kPXByaW9yaXR5CmJhc2V1cmw9aHR0cDovL2luZnJhc3RydWN0dXJlLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9mZWRvcmEvbGludXgvcmVsZWFzZXMvJHJlbGVhc2V2ZXIvRXZlcnl0aGluZy8kYmFzZWFyY2gvZGVidWcvCiNtZXRhbGluaz1odHRwczovL21pcnJvcnMuZmVkb3JhcHJvamVjdC5vcmcvbWV0YWxpbms/cmVwbz1mZWRvcmEtZGVidWctJHJlbGVhc2V2ZXImYXJjaD0kYmFzZWFyY2gKZW5hYmxlZD0wCm1ldGFkYXRhX2V4cGlyZT03ZApncGdjaGVjaz0xCmdwZ2tleT1maWxlOi8vL2V0Yy9wa2kvcnBtLWdwZy9SUE0tR1BHLUtFWS1mZWRvcmEtJHJlbGVhc2V2ZXItJGJhc2VhcmNoCgpbZmVkb3JhLXNvdXJjZV0KbmFtZT1GZWRvcmEgJHJlbGVhc2V2ZXIgLSBTb3VyY2UKZmFpbG92ZXJtZXRob2Q9cHJpb3JpdHkKYmFzZXVybD1odHRwOi8vaW5mcmFzdHJ1Y3R1cmUuZmVkb3JhcHJvamVjdC5vcmcvcHViL2ZlZG9yYS9saW51eC9yZWxlYXNlcy8kcmVsZWFzZXZlci9FdmVyeXRoaW5nL3NvdXJjZS9TUlBNUy8KI21ldGFsaW5rPWh0dHBzOi8vbWlycm9ycy5mZWRvcmFwcm9qZWN0Lm9yZy9tZXRhbGluaz9yZXBvPWZlZG9yYS1zb3VyY2UtJHJlbGVhc2V2ZXImYXJjaD0kYmFzZWFyY2gKZW5hYmxlZD0wCm1ldGFkYXRhX2V4cGlyZT03ZApncGdjaGVjaz0xCmdwZ2tleT1maWxlOi8vL2V0Yy9wa2kvcnBtLWdwZy9SUE0tR1BHLUtFWS1mZWRvcmEtJHJlbGVhc2V2ZXItJGJhc2VhcmNoCg==' owner: root:root @@ -49,6 +50,7 @@ write_files: owner: root:root path: /etc/yum.repos.d/fedora-updates-testing.repo permissions: '0644' +{% endif %} """ #ATOMIC_USER_DATA = """#cloud-config #password: %s diff --git a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 index a59259d50a..92d13650a0 100644 --- a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 +++ b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 @@ -137,16 +137,19 @@ artifacts_baseurl: {{ artifacts_base_url }} ## Variables disposable_(release|flavor|arch) set in this config file ## define what kind of image is looked for. ## The newest (by YYMMDD_HHMM) image of the respective R-F-A is used. -imagesdir: {{imagesdir}} +imagesdir: {{ imagesdir }} ## If set to False, latest image from imagesdir will be used instead of one at imageurl ## [default: True] +{% if deployment_type in ['dev'] %} +force_imageurl: False + +## Url of an image to download and use for disposable client, if force_imageurl was set +#imageurl: +{% else %} #force_imageurl: True ## Url of an image to download and use for disposable client, if force_imageurl was set -{% if deployment_type in ['dev'] %} -#imageurl: -{% else %} imageurl: file:///srv/diskimages/20160126-taskotron-f23.qcow2 {% endif %}