From 684a513258e1f9e6cade95a1048b42a0e1a1b722 Mon Sep 17 00:00:00 2001 From: Logan V Date: Thu, 17 Nov 2016 11:10:01 -0600 Subject: [PATCH] Fix jinja defaulting syntax a397922 introduced a syntax error by attempting to default an unquoted string, which causes execution failures on some ansible versions with: Failed to template {{ ceph_rhcs_mount_path }}: Failed to template {{ ceph_stable_rh_storage_mount_path | default(/tmp/rh-storage-mount) }}: template error while templating string: unexpected '/' --- group_vars/all.yml.sample | 5 ++--- roles/ceph-common/defaults/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index bdd92a563..70e3d6884 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -155,8 +155,8 @@ dummy: #ceph_rhcs_cdn_install: "{{ ceph_stable_rh_storage_cdn_install | default(false) }}" # assumes all the nodes can connect to cdn.redhat.com #ceph_rhcs_iso_install: "{{ ceph_stable_rh_storage_iso_install | default(false) }}" # usually used when nodes don't have access to cdn.redhat.com #ceph_rhcs_iso_path: "{{ ceph_stable_rh_storage_iso_path | default('') }}" -#ceph_rhcs_mount_path: "{{ ceph_stable_rh_storage_mount_path | default(/tmp/rh-storage-mount) }}" -#ceph_rhcs_repository_path: "{{ ceph_stable_rh_storage_repository_path | default(/tmp/rh-storage-repo) }}" # where to copy iso's content +#ceph_rhcs_mount_path: "{{ ceph_stable_rh_storage_mount_path | default('/tmp/rh-storage-mount') }}" +#ceph_rhcs_repository_path: "{{ ceph_stable_rh_storage_repository_path | default('/tmp/rh-storage-repo') }}" # where to copy iso's content # UBUNTU CLOUD ARCHIVE @@ -381,4 +381,3 @@ dummy: #nfs_file_gw: true # Set this to true to enable Object access via NFS. Requires an RGW role. #nfs_obj_gw: false - diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml index d4b9932c2..deaec7f8a 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -147,8 +147,8 @@ ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(2) }}" ceph_rhcs_cdn_install: "{{ ceph_stable_rh_storage_cdn_install | default(false) }}" # assumes all the nodes can connect to cdn.redhat.com ceph_rhcs_iso_install: "{{ ceph_stable_rh_storage_iso_install | default(false) }}" # usually used when nodes don't have access to cdn.redhat.com ceph_rhcs_iso_path: "{{ ceph_stable_rh_storage_iso_path | default('') }}" -ceph_rhcs_mount_path: "{{ ceph_stable_rh_storage_mount_path | default(/tmp/rh-storage-mount) }}" -ceph_rhcs_repository_path: "{{ ceph_stable_rh_storage_repository_path | default(/tmp/rh-storage-repo) }}" # where to copy iso's content +ceph_rhcs_mount_path: "{{ ceph_stable_rh_storage_mount_path | default('/tmp/rh-storage-mount') }}" +ceph_rhcs_repository_path: "{{ ceph_stable_rh_storage_repository_path | default('/tmp/rh-storage-repo') }}" # where to copy iso's content # UBUNTU CLOUD ARCHIVE