summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2017-11-23 11:47:32 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-11-23 11:47:32 +0000
commit8c3bfe80fc76b37bb68b4a047b3400bf0291b12d (patch)
tree7bfd1d1ecfb0f56159f292fdf0d0b18f6a76d999
parent417d77241d83620f455cffcaf75efd11003cf2c6 (diff)
downloadinfrastructure-8c3bfe80fc76b37bb68b4a047b3400bf0291b12d.tar.gz
Work around Ansible 2.4.1 bug
See https://github.com/ansible/ansible/issues/32812
-rw-r--r--baserock_ostree/instance-config.yml6
-rw-r--r--baserock_webserver/instance-config.yml6
2 files changed, 10 insertions, 2 deletions
diff --git a/baserock_ostree/instance-config.yml b/baserock_ostree/instance-config.yml
index 1f218fc0..6228d99d 100644
--- a/baserock_ostree/instance-config.yml
+++ b/baserock_ostree/instance-config.yml
@@ -9,7 +9,11 @@
become: yes
become_method: sudo
tasks:
- - import_tasks: ../tasks/create-data-volume.yml lv_name=ostree lv_size=290g mountpoint=/srv
+ - import_tasks: ../tasks/create-data-volume.yml
+ vars:
+ lv_name: ostree
+ lv_size: 290g
+ mountpoint: /srv
# This should perhaps have been called ostree-cache
- name: ostree user
diff --git a/baserock_webserver/instance-config.yml b/baserock_webserver/instance-config.yml
index 96f0ee01..6923f305 100644
--- a/baserock_webserver/instance-config.yml
+++ b/baserock_webserver/instance-config.yml
@@ -7,7 +7,11 @@
become: yes
become_method: sudo
tasks:
- - import_tasks: ../tasks/create-data-volume.yml lv_name=webserver lv_size=145g mountpoint=/srv
+ - import_tasks: ../tasks/create-data-volume.yml
+ vars:
+ lv_name: webserver
+ lv_size: 145g
+ mountpoint: /srv
- name: /srv/download.baserock.org/
file: path=/srv/download.baserock.org/ owner=fedora state=directory