diff options
| author | Zuul <zuul@review.opendev.org> | 2020-09-07 15:07:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-09-07 15:07:17 +0000 |
| commit | b6cf0432a754a520b7843107725706937d3eef3f (patch) | |
| tree | 9e5047b970367c1e1d5047d640364e7c2334fdb9 /devstack | |
| parent | 3709cce11f696f324f501090d050273a1fcb4a70 (diff) | |
| parent | 5b272b0c46f5a10c50fc7325cc653fd577908ca0 (diff) | |
| download | ironic-b6cf0432a754a520b7843107725706937d3eef3f.tar.gz | |
Merge "Remove token-less agent support"
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/lib/ironic | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 831821ff1..354ffe344 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -550,9 +550,6 @@ IRONIC_DEPLOY_LOGS_LOCAL_PATH=${IRONIC_DEPLOY_LOGS_LOCAL_PATH:-$IRONIC_VM_LOG_DI # Fast track option IRONIC_DEPLOY_FAST_TRACK=${IRONIC_DEPLOY_FAST_TRACK:-False} -# Agent Token requirement -IRONIC_REQUIRE_AGENT_TOKEN=${IRONIC_REQUIRE_AGENT_TOKEN:-True} - # Define baremetal min_microversion in tempest config. Default value None is picked from tempest. TEMPEST_BAREMETAL_MIN_MICROVERSION=${TEMPEST_BAREMETAL_MIN_MICROVERSION:-} @@ -1426,8 +1423,6 @@ function configure_ironic { # Set fast track options iniset $IRONIC_CONF_FILE deploy fast_track $IRONIC_DEPLOY_FAST_TRACK - # Set requirement for agent tokens - iniset $IRONIC_CONF_FILE DEFAULT require_agent_token $IRONIC_REQUIRE_AGENT_TOKEN # No need to check if RabbitMQ is enabled, this call does it in a smart way if [[ "$IRONIC_RPC_TRANSPORT" == "oslo" ]]; then iniset_rpc_backend ironic $IRONIC_CONF_FILE |