diff --git a/02_configure_host.sh b/02_configure_host.sh index 11775455f..4c37b3504 100755 --- a/02_configure_host.sh +++ b/02_configure_host.sh @@ -321,6 +321,9 @@ clone_repo "${IPAMREPO}" "${IPAMBRANCH}" "${IPAMPATH}" "${IPAMCOMMIT}" detect_mismatch "${CAPI_LOCAL_IMAGE:-}" "${CAPIPATH}" clone_repo "${CAPIREPO}" "${CAPIBRANCH}" "${CAPIPATH}" "${CAPICOMMIT}" +detect_mismatch "${IRSO_LOCAL_IMAGE:-}" "${IRSOPATH}" +clone_repo "${IRSOREPO}" "${IRSOBRANCH}" "${IRSOPATH}" "${IRSOCOMMIT}" + # MariaDB and Ironic source is not needed unless the images are built locally # If the repo path does not match with the IMAGE location that means the image # is built from a repo that is not under dev-env's control thus there is no diff --git a/03_launch_mgmt_cluster.sh b/03_launch_mgmt_cluster.sh index 238d4f958..3243eb2c9 100755 --- a/03_launch_mgmt_cluster.sh +++ b/03_launch_mgmt_cluster.sh @@ -224,6 +224,99 @@ EOF popd } +launch_ironic_standalone_operator() { + # TODO(dtantsur): IPA branch support + cat > "${IRSOPATH}/config/manager/manager.env" < "${ironic}" <> "${ironic}" <> "${ironic}" <> "${ironic}" < "${IRONIC_AUTH_DIR}ironic-username" + echo -n "$IRONIC_USERNAME" > "${IRONIC_AUTH_DIR}ironic-username" else IRONIC_USERNAME="$(cat "${IRONIC_AUTH_DIR}ironic-username")" fi @@ -17,7 +17,7 @@ if [ "${IRONIC_BASIC_AUTH}" == "true" ]; then if [ -z "${IRONIC_PASSWORD:-}" ]; then if [ ! -f "${IRONIC_AUTH_DIR}ironic-password" ]; then IRONIC_PASSWORD="$(uuidgen)" - echo "$IRONIC_PASSWORD" > "${IRONIC_AUTH_DIR}ironic-password" + echo -n "$IRONIC_PASSWORD" > "${IRONIC_AUTH_DIR}ironic-password" else IRONIC_PASSWORD="$(cat "${IRONIC_AUTH_DIR}ironic-password")" fi diff --git a/lib/network.sh b/lib/network.sh index b3eed2d06..775794b4e 100644 --- a/lib/network.sh +++ b/lib/network.sh @@ -82,8 +82,8 @@ else fi # Calculate DHCP range -network_address ironic_dhcp_range_start "$BARE_METAL_PROVISIONER_NETWORK" 10 -network_address ironic_dhcp_range_end "$BARE_METAL_PROVISIONER_NETWORK" 100 +network_address CLUSTER_DHCP_RANGE_START "$BARE_METAL_PROVISIONER_NETWORK" 10 +network_address CLUSTER_DHCP_RANGE_END "$BARE_METAL_PROVISIONER_NETWORK" 100 # The nex range is for IPAM to know what is the pool that porovisioned noodes # can get IP's from network_address IPAM_PROVISIONING_POOL_RANGE_START "$BARE_METAL_PROVISIONER_NETWORK" 100 @@ -91,7 +91,7 @@ network_address IPAM_PROVISIONING_POOL_RANGE_END "$BARE_METAL_PROVISIONER_NETWOR export IPAM_PROVISIONING_POOL_RANGE_START export IPAM_PROVISIONING_POOL_RANGE_END -export CLUSTER_DHCP_RANGE=${CLUSTER_DHCP_RANGE:-"$ironic_dhcp_range_start,$ironic_dhcp_range_end"} +export CLUSTER_DHCP_RANGE=${CLUSTER_DHCP_RANGE:-"$CLUSTER_DHCP_RANGE_START,$CLUSTER_DHCP_RANGE_END"} EXTERNAL_SUBNET=${EXTERNAL_SUBNET:-""} if [[ -n "${EXTERNAL_SUBNET}" ]]; then diff --git a/vars.md b/vars.md index 197dd3705..5a4eefb6b 100644 --- a/vars.md +++ b/vars.md @@ -138,6 +138,9 @@ assured that they are persisted. | IPA_BASEURI | IPA downloader will download IPA from this url | | https://tarballs.opendev.org/openstack/ironic-python-agent/dib | | IPA_BRANCH | The last part of the name of the IPA archive | | master | | IPA_FLAVOR | The middle part of the name of the IPA archive | | centos9 | +| IRSOREPO | Ironic Standalone Operator git repository URL | | https://github.com/metal3-io/ironic-standalone-operator.git | +| IRSOBRANCH | Ironic Standalone Operator git repository branch to checkout | | main | +| IRSOCOMMIT | Ironic Standalone Operator git commit to checkout on IRSOBRANCH | | HEAD | **NOTE** `(BMO/CAPI/CAPM3/IPAM)RELEASE` variables are also affecting the