diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-28 15:42:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-28 15:42:05 +0000 |
| commit | 5c1f2d102942e9f4d946cfaaf747e4d551b237a8 (patch) | |
| tree | 119809f6aa5b1796ee59eacaa5580b970ac684fd /devstack | |
| parent | 7c2f2c30ea03fcd13ca449f5bd6f82b2b95a6924 (diff) | |
| parent | 89971c3e86ce62d6421475738880a5ddd9e0e55b (diff) | |
| download | ironic-5c1f2d102942e9f4d946cfaaf747e4d551b237a8.tar.gz | |
Merge "Prepare stable/stein testing" into stable/stein
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/lib/ironic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 21939b9ba..3e6a2af89 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -239,7 +239,7 @@ IRONIC_DEPLOY_KERNEL=${IRONIC_DEPLOY_KERNEL:-$TOP_DIR/files/ir-deploy-$IRONIC_DE IRONIC_DEPLOY_ISO=${IRONIC_DEPLOY_ISO:-$TOP_DIR/files/ir-deploy-$IRONIC_DEPLOY_DRIVER.iso} # NOTE(jroll) this needs to be updated when stable branches are cut -IPA_DOWNLOAD_BRANCH=${IPA_DOWNLOAD_BRANCH:-master} +IPA_DOWNLOAD_BRANCH=${IPA_DOWNLOAD_BRANCH:-stable/stein} IPA_DOWNLOAD_BRANCH=$(echo $IPA_DOWNLOAD_BRANCH | tr / -) # Configure URLs required to download ramdisk if we're not building it, and @@ -457,7 +457,7 @@ IRONIC_DEPLOY_FAST_TRACK=${IRONIC_DEPLOY_FAST_TRACK:-False} TEMPEST_BAREMETAL_MIN_MICROVERSION=${TEMPEST_BAREMETAL_MIN_MICROVERSION:-} # Define baremetal max_microversion in tempest config. No default value means that it is picked from tempest. -TEMPEST_BAREMETAL_MAX_MICROVERSION=${TEMPEST_BAREMETAL_MAX_MICROVERSION:-} +TEMPEST_BAREMETAL_MAX_MICROVERSION=${TEMPEST_BAREMETAL_MAX_MICROVERSION:-1.56} # get_pxe_boot_file() - Get the PXE/iPXE boot file path function get_pxe_boot_file { |