Skip to content

Icp312 #15

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Icp312 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a679535
changed password length to match with ICP 3.1.2 password rules
dkleinfelder Feb 22, 2019
3ae7f25
changed hardcoded reference to icp 3.1.0 image to 3.1.2 in bootstrap.sh
dkleinfelder Feb 22, 2019
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
4 changes: 2 additions & 2 deletions scripts/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ image_load() {
#TODO Is this install directory parameterized?
IMAGE_DIR=/opt/ibm/cluster/images
mkdir -p ${IMAGE_DIR}
${awscli} s3 cp ${image_location} ${IMAGE_DIR}/ibm-cloud-private-x86_64-3.1.0.tar.gz
tar zxf ${IMAGE_DIR}/ibm-cloud-private-x86_64-3.1.0.tar.gz -O | docker load
${awscli} s3 cp ${image_location} ${IMAGE_DIR}/ibm-cloud-private-x86_64-3.1.2.tar.gz
tar zxf ${IMAGE_DIR}/ibm-cloud-private-x86_64-3.1.2.tar.gz -O | docker load
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was meant as a temporary filename and it didn't really matter what the version on this was as it would just extract whatever was in S3 and load it.

if you want, you can change this to ${IMAGE_DIR}/basename ${image_location}` so it just uses the filename of what was out there on s3. so we don't have to change the filenames every time there's a new release

Copy link

@hassenius hassenius Feb 22, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 to having those two lines say

${awscli} s3 cp ${image_location} ${IMAGE_DIR}/$(basename ${image_location})
tar zxf ${IMAGE_DIR}/$(basename ${image_location}) -O | docker load

Will both be more future proof and avoid confusion

fi
fi

Expand Down
2 changes: 1 addition & 1 deletion variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ variable "va" {
}

variable "instance_name" { default = "icp" }
variable "icppassword" { default = "MySecretP4ssw0RD" }
variable "icppassword" { default = "MySecretP4ssw0RDMySecretP4ssw0RD" }

variable "docker_package_location" {
description = "When installing ICP EE on RedHat. Prefix location string with http: or nfs: to indicate protocol "
Expand Down