diff options
| -rw-r--r-- | api-ref/source/baremetal-api-v1-indicators.inc | 4 | ||||
| -rw-r--r-- | ironic/db/sqlalchemy/__init__.py | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/api-ref/source/baremetal-api-v1-indicators.inc b/api-ref/source/baremetal-api-v1-indicators.inc index 0c4b11885..181951982 100644 --- a/api-ref/source/baremetal-api-v1-indicators.inc +++ b/api-ref/source/baremetal-api-v1-indicators.inc @@ -90,7 +90,7 @@ Response Parameters Get Indicator State =================== -.. rest_method:: GET /v1/nodes/{node_ident}/management/indicators/{component}/{ind_ident} +.. rest_method:: GET /v1/nodes/{node_ident}/management/indicators/{ind_ident}@{component} .. versionadded:: 1.63 @@ -127,7 +127,7 @@ Response Parameters Set Indicator State =================== -.. rest_method:: PUT /v1/nodes/{node_ident}/management/indicators/{component}/{ind_ident} +.. rest_method:: PUT /v1/nodes/{node_ident}/management/indicators/{ind_ident}@{component} .. versionadded:: 1.63 diff --git a/ironic/db/sqlalchemy/__init__.py b/ironic/db/sqlalchemy/__init__.py index c656ed227..f92a0b600 100644 --- a/ironic/db/sqlalchemy/__init__.py +++ b/ironic/db/sqlalchemy/__init__.py @@ -17,10 +17,8 @@ from sqlalchemy import event CONF = cfg.CONF -# FIXME(stephenfin): we need to remove reliance on autocommit semantics ASAP -# since it's not compatible with SQLAlchemy 2.0 # NOTE(dtantsur): we want sqlite as close to a real database as possible. -enginefacade.configure(sqlite_fk=True, __autocommit=True) +enginefacade.configure(sqlite_fk=True) # NOTE(TheJulia): Setup a listener to trigger the sqlite write-ahead |