From 62904770c9b2754e3c541cd7b19d3af631cbfe0e Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Mon, 23 Jul 2018 10:52:43 -0700 Subject: [PATCH] installer/pkg: Drop "ignition-" from "ignition-*.ign" filenames The ".ign" suffix is sufficient to identify these as ignition filenames. The old filenames were from 461ff5f1 (cli: add support for user ignition files, 2018-03-23, coreos/tectonic-installer#3120), which does not motivate the "ingition-" prefix. This gets us closer to the filenames discussed in bf830cc4 (Documentation/design: add prepare design, 2018-07-11, #50) and b111829d (Documentation/design: add launch design, 2018-07-11, #51). --- installer/pkg/config/cluster.go | 6 +++--- installer/pkg/workflow/fixtures/terraform.tfvars | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/installer/pkg/config/cluster.go b/installer/pkg/config/cluster.go index c0eb136f1b0..590449a6797 100644 --- a/installer/pkg/config/cluster.go +++ b/installer/pkg/config/cluster.go @@ -13,11 +13,11 @@ import ( const ( // IgnitionMaster is the relative path to the ign master cfg from the tf working directory - IgnitionMaster = "ignition-master.ign" + IgnitionMaster = "master.ign" // IgnitionWorker is the relative path to the ign worker cfg from the tf working directory - IgnitionWorker = "ignition-worker.ign" + IgnitionWorker = "worker.ign" // IgnitionEtcd is the relative path to the ign etcd cfg from the tf working directory - IgnitionEtcd = "ignition-etcd.ign" + IgnitionEtcd = "etcd.ign" // PlatformAWS is the platform for a cluster launched on AWS. PlatformAWS Platform = "aws" // PlatformLibvirt is the platform for a cluster launched on libvirt. diff --git a/installer/pkg/workflow/fixtures/terraform.tfvars b/installer/pkg/workflow/fixtures/terraform.tfvars index 3c24f05c5f9..81c9c3f1227 100644 --- a/installer/pkg/workflow/fixtures/terraform.tfvars +++ b/installer/pkg/workflow/fixtures/terraform.tfvars @@ -21,9 +21,9 @@ "tectonic_container_linux_channel": "beta", "tectonic_container_linux_version": "latest", "tectonic_etcd_count": 3, - "tectonic_ignition_etcd": "ignition-etcd.ign", - "tectonic_ignition_master": "ignition-master.ign", - "tectonic_ignition_worker": "ignition-worker.ign", + "tectonic_ignition_etcd": "etcd.ign", + "tectonic_ignition_master": "master.ign", + "tectonic_ignition_worker": "worker.ign", "tectonic_libvirt_network_if": "osbr0", "tectonic_libvirt_resolver": "8.8.8.8", "tectonic_master_count": 2,