Skip to content

WIP: Add new items for configuring the BMO to the baremetal platform. #818

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

Closed
imain wants to merge 1 commit into from
Closed

WIP: Add new items for configuring the BMO to the baremetal platform. #818

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
1 change: 0 additions & 1 deletion 02_configure_host.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ set -xe
source logging.sh
source common.sh
source utils.sh
source ocp_install_env.sh

# Generate user ssh key
if [ ! -f $HOME/.ssh/id_rsa.pub ]; then
Expand Down
2 changes: 1 addition & 1 deletion 06_create_cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ set -e
source logging.sh
source utils.sh
source common.sh
source ocp_install_env.sh
Copy link
Contributor

@sadasu sadasu Oct 10, 2019

Choose a reason for hiding this comment

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

The changes in this file seem to be a no-op.

source rhcos.sh
source ocp_install_env.sh

# Do some PULL_SECRET sanity checking
if [[ "${OPENSHIFT_RELEASE_IMAGE}" == *"registry.svc.ci.openshift.org"* ]]; then
Expand Down
5 changes: 5 additions & 0 deletions ocp_install_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ controlPlane:
platform:
baremetal:
dnsVIP: ${DNS_VIP}
provisioningInterface: "ens3"
provisioningNetworkCIDR: "172.22.0.0/24"
provisioningIP: "172.22.0.3/24"
Copy link

@hardys hardys Oct 3, 2019

Choose a reason for hiding this comment

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

All of these should have defaults in the installer PR, e.g see pkg/types/baremetal/defaults/platform.go

provisioningDHCPRange: "172.22.0.10,172.22.0.100"
rhcosImageURL: "${RHCOS_IMAGE_URL}"
Copy link

@hardys hardys Oct 3, 2019

Choose a reason for hiding this comment

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

As mentioned on the installer PR we shouldn't add rhcosImageURL because it's data that's already known to the installer - we only care about RHCOS_IMAGE_URL in dev-scripts because we cache the image

hosts:
$(master_node_map_to_install_config $NUM_MASTERS)
pullSecret: |
Expand Down