diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f1d6377d..ca4f88bc 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,6 +17,8 @@ Minor Changes - baremetal_node - Add ``target_provision_state`` option. - baremetal_node - Allow registering nodes without NICs. +- identity_user - Added an ``options`` parameter to set Keystone user resource options, e.g. ``ignore_password_expiry`` and ``ignore_change_password_upon_first_use``. On update, the provided options are merged with the user's existing options so options not managed by this module are preserved. +- loadbalancer - Add option to specify the availability zone a loadbalancer should be created in. - server_action - Add ``live_migrate`` action. Bugfixes diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index fde873e5..b448e666 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -688,11 +688,19 @@ releases: minor_changes: - baremetal_node - Add ``target_provision_state`` option. - baremetal_node - Allow registering nodes without NICs. + - identity_user - Added an ``options`` parameter to set Keystone user resource + options, e.g. ``ignore_password_expiry`` and ``ignore_change_password_upon_first_use``. + On update, the provided options are merged with the user's existing options + so options not managed by this module are preserved. + - loadbalancer - Add option to specify the availability zone a loadbalancer + should be created in. - server_action - Add ``live_migrate`` action. release_summary: Bugfixes and minor changes. fragments: + - add_az_parameter_to_loadbalancer.yaml - baremetal_provision_state.yaml - bug_2167592.yaml + - identity_user_options.yaml - image_web_download.yaml - rbac_target_project_id.yaml - recordset_find_by_type.yaml diff --git a/changelogs/fragments/add_az_parameter_to_loadbalancer.yaml b/changelogs/fragments/add_az_parameter_to_loadbalancer.yaml deleted file mode 100644 index c9a4afde..00000000 --- a/changelogs/fragments/add_az_parameter_to_loadbalancer.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -minor_changes: - - loadbalancer - Add option to specify the availability zone a loadbalancer should be created in. \ No newline at end of file diff --git a/changelogs/fragments/identity_user_options.yaml b/changelogs/fragments/identity_user_options.yaml deleted file mode 100644 index 780f5e11..00000000 --- a/changelogs/fragments/identity_user_options.yaml +++ /dev/null @@ -1,6 +0,0 @@ -minor_changes: - - identity_user - Added an ``options`` parameter to set Keystone user - resource options, e.g. ``ignore_password_expiry`` and - ``ignore_change_password_upon_first_use``. On update, the provided - options are merged with the user's existing options so options not - managed by this module are preserved.