From 973a65494b2b2aa21201a24723906d851adfefd1 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 21 Jan 2021 17:42:08 +0200 Subject: [PATCH] Add designate pool uuid to secrets That UUID is supposed to be generated per deployment instead of being hardcoded in role defaults Change-Id: I452d23c650104b8dfe53f3477a3c3ef9c2c62b56 --- etc/openstack_deploy/user_secrets.yml | 1 + .../notes/designate_pool_uuid-e57aadb4e5ac9f87.yaml | 12 ++++++++++++ scripts/upgrade-utilities/deploy-config-changes.yml | 11 +++++++++++ 3 files changed, 24 insertions(+) create mode 100644 releasenotes/notes/designate_pool_uuid-e57aadb4e5ac9f87.yaml diff --git a/etc/openstack_deploy/user_secrets.yml b/etc/openstack_deploy/user_secrets.yml index 7b8993f878..3662e18bc1 100644 --- a/etc/openstack_deploy/user_secrets.yml +++ b/etc/openstack_deploy/user_secrets.yml @@ -260,6 +260,7 @@ designate_oslomsg_rpc_password: # Please also wire the appropriate userid in # your user variables. #designate_oslomsg_notify_password: +designate_pool_uuid: designate_service_password: ## Tacker options diff --git a/releasenotes/notes/designate_pool_uuid-e57aadb4e5ac9f87.yaml b/releasenotes/notes/designate_pool_uuid-e57aadb4e5ac9f87.yaml new file mode 100644 index 0000000000..bc9f3fa284 --- /dev/null +++ b/releasenotes/notes/designate_pool_uuid-e57aadb4e5ac9f87.yaml @@ -0,0 +1,12 @@ +--- +upgrade: + - | + For Designate ``designate_pool_uuid`` was hardcoded in os_designate role. + Now it's dynamically generated in secrets.yml and unique per deployment. + However, before upgrade you must set ``designate_pool_uuid`` to the + current uuid. Most likely it is `794ccc2c-d751-44fe-b57f-8894c9f5c842` + since that value has been defaulted in the role and it would remain the same + unless explicitly overwritten. + You can check your pool uuid with the command + `/openstack/venvs/designate-20.1.1.dev7/bin/designate-manage pool show_config` + that should be executed from the Designate venv. diff --git a/scripts/upgrade-utilities/deploy-config-changes.yml b/scripts/upgrade-utilities/deploy-config-changes.yml index 52a702b0bf..7a4b4d6b13 100644 --- a/scripts/upgrade-utilities/deploy-config-changes.yml +++ b/scripts/upgrade-utilities/deploy-config-changes.yml @@ -85,6 +85,17 @@ tags: - update-secrets + # TODO(noonedeadpunk): Remove after W cycle + - name: Define Designate pool id + lineinfile: + dest: "{{ openstack_config_dir }}/user_secrets.yml" + regexp: "^designate_pool_uuid" + line: "designate_pool_uuid: {{ designate_pool_uuid | default('794ccc2c-d751-44fe-b57f-8894c9f5c842') }}" + when: + - not (user_secrets.stdout | regex_search('((^|\n)designate_pool_uuid)')) + tags: + - update-secrets + - name: Generate new secrets shell: "{{ repo_root_dir }}/scripts/pw-token-gen.py --file {{ openstack_config_dir }}/user_secrets.yml" tags: