Skip to content

Commit ba5fc42

Browse files
Fix typos
Signed-off-by: michal.gubricky <michal.gubricky@dnation.cloud>
1 parent 9f435e9 commit ba5fc42

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ csctl
2020
csctl-openstack
2121
tmp/
2222
releases/
23+
output/

csctlopenstack/csctlopenstack_main.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,21 @@ func main() {
109109
fmt.Println("Packer build completed successfully.")
110110

111111
registryConfig := filepath.Join(clusterStackPath, "node-images", "registry.yaml")
112+
112113
// Get the current working directory
113114
currentDir, err := os.Getwd()
114115
if err != nil {
115116
fmt.Printf("Error getting current working directory: %v\n", err)
116117
os.Exit(1)
117118
}
118-
ouputImageDir := filepath.Join(currentDir, "output", *image)
119+
120+
// Path to the image created by the packer
121+
// TODO: "output" directory where packer built image should be some variable(registry.yaml?)
122+
// Warning: name of the image created by packer should have same name as the name of the image folder in node-images
123+
ouputImagePath := filepath.Join(currentDir, "output", *image)
124+
119125
// Push the built image to S3
120-
if err := pushToS3(ouputImageDir, *image, registryConfig); err != nil {
126+
if err := pushToS3(ouputImagePath, *image, registryConfig); err != nil {
121127
fmt.Printf("Error pushing image to S3: %v\n", err)
122128
os.Exit(1)
123129
}

csctlopenstack/example/cluster-stacks/openstack/ferrol/node-images/control-plane-ubuntu-2204/image.json.pkr.hcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ packer {
88
}
99

1010
locals {
11-
output_directory = "./output/${var.build_name}"
11+
output_directory = "./output"
1212
scripts = "${path.root}/scripts"
13-
http_directory = "${path.root}/http"
13+
http_directory = "${path.root}/http"
1414
vm_name = "${var.build_name}"
1515
}
1616

csctlopenstack/example/cluster-stacks/openstack/ferrol/node-images/registry.yml renamed to csctlopenstack/example/cluster-stacks/openstack/ferrol/node-images/registry.yaml

File renamed without changes.

0 commit comments

Comments
 (0)