Skip to content

installer/pkg: Drop "ignition-" from "ignition-*.ign" filenames #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jul 24, 2018
Merged

installer/pkg: Drop "ignition-" from "ignition-*.ign" filenames #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions installer/pkg/config/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions installer/pkg/workflow/fixtures/terraform.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down