From 0e2bc0b02c076c139898ab6576500ef8c9959526 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Wed, 29 Jan 2020 10:50:27 +0100 Subject: [PATCH 1/2] openstack: remove "filesystem" from tf files This makes ignition files FCOS-compatible --- data/data/openstack/masters/main.tf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/data/data/openstack/masters/main.tf b/data/data/openstack/masters/main.tf index ce4a9b92023..fce6d7a4be4 100644 --- a/data/data/openstack/masters/main.tf +++ b/data/data/openstack/masters/main.tf @@ -3,10 +3,9 @@ data "openstack_compute_flavor_v2" "masters_flavor" { } data "ignition_file" "hostname" { - count = var.instance_count - filesystem = "root" - mode = "420" // 0644 - path = "/etc/hostname" + count = var.instance_count + mode = "420" // 0644 + path = "/etc/hostname" content { content = < Date: Wed, 29 Jan 2020 10:53:18 +0100 Subject: [PATCH 2/2] openstack: use "merge" instead of "append" in tf --- data/data/openstack/masters/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/data/openstack/masters/main.tf b/data/data/openstack/masters/main.tf index fce6d7a4be4..922e1da7062 100644 --- a/data/data/openstack/masters/main.tf +++ b/data/data/openstack/masters/main.tf @@ -17,7 +17,7 @@ EOF data "ignition_config" "master_ignition_config" { count = var.instance_count - append { + merge { source = "data:text/plain;charset=utf-8;base64,${base64encode(var.user_data_ign)}" }