Update patch set 4
Patch Set 4:
(4 comments)
Patch-set: 4
Attention: {"person_ident":"Gerrit User 6926 \u003c6926@4a232e18-c5a9-48ee-94c0-e04e7cca6543\u003e","operation":"ADD","reason":"\u003cGERRIT_ACCOUNT_18002\u003e replied on the change"}
Attention: {"person_ident":"Gerrit User 18002 \u003c18002@4a232e18-c5a9-48ee-94c0-e04e7cca6543\u003e","operation":"REMOVE","reason":"\u003cGERRIT_ACCOUNT_18002\u003e replied on the change"}
This commit is contained in:
Gerrit User 18002
Gerrit Code Review
parent
f6414d6d7c
commit
9b3b731c3a
|
|
@ -17,6 +17,24 @@
|
|||
"revId": "4fcb0827c9bfd4d8d41a571e81e513647975e67a",
|
||||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
|
||||
},
|
||||
{
|
||||
"unresolved": true,
|
||||
"key": {
|
||||
"uuid": "e648f4b2_122fd14a",
|
||||
"filename": "tripleo_ansible/roles/tripleo_nova_libvirt/files/nova_libvirt_init_secret.sh",
|
||||
"patchSetId": 4
|
||||
},
|
||||
"lineNbr": 45,
|
||||
"author": {
|
||||
"id": 18002
|
||||
},
|
||||
"writtenOn": "2022-10-07T19:59:36Z",
|
||||
"side": 1,
|
||||
"message": "Yes, I realized that as I was updating this script. However, I decided to minimize my changes to this script as much as possible given that it\u0027s known to work going back to train for puppet-deployed systems including DCN deployments.\n\nIf you look at the diff [1] from when I only imported the script from THT, then you\u0027ll see I didn\u0027t change the logic to \"Ensure the secret XML file exists\". I left that in tact though I wrapped it in a new conditional. I then made that same code handle another condition, where puppet is not used, without actually changing the code that works when puppet is used. I think this change is safer as it doesn\u0027t disturb something we might be overlooking that can only be found from more empirical testing.\n\n[1] https://review.opendev.org/c/openstack/tripleo-ansible/+/858585/1..3/tripleo_ansible/roles/tripleo_nova_libvirt/files/nova_libvirt_init_secret.sh",
|
||||
"parentUuid": "843e07dd_8275f1e4",
|
||||
"revId": "4fcb0827c9bfd4d8d41a571e81e513647975e67a",
|
||||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
|
||||
},
|
||||
{
|
||||
"unresolved": true,
|
||||
"key": {
|
||||
|
|
@ -33,6 +51,41 @@
|
|||
"message": "and these 2 - can go to the line #39",
|
||||
"revId": "4fcb0827c9bfd4d8d41a571e81e513647975e67a",
|
||||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
|
||||
},
|
||||
{
|
||||
"unresolved": true,
|
||||
"key": {
|
||||
"uuid": "2ba13e37_21a8f8da",
|
||||
"filename": "tripleo_ansible/roles/tripleo_nova_libvirt/files/nova_libvirt_init_secret.sh",
|
||||
"patchSetId": 4
|
||||
},
|
||||
"lineNbr": 49,
|
||||
"author": {
|
||||
"id": 18002
|
||||
},
|
||||
"writtenOn": "2022-10-07T19:59:36Z",
|
||||
"side": 1,
|
||||
"message": "Please see above.",
|
||||
"parentUuid": "0d91760b_ffadc194",
|
||||
"revId": "4fcb0827c9bfd4d8d41a571e81e513647975e67a",
|
||||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
|
||||
},
|
||||
{
|
||||
"unresolved": true,
|
||||
"key": {
|
||||
"uuid": "c9110362_65185250",
|
||||
"filename": "tripleo_ansible/roles/tripleo_nova_libvirt/templates/nova_libvirt_init_secret.yaml.j2",
|
||||
"patchSetId": 4
|
||||
},
|
||||
"lineNbr": 9,
|
||||
"author": {
|
||||
"id": 18002
|
||||
},
|
||||
"writtenOn": "2022-10-07T19:59:36Z",
|
||||
"side": 1,
|
||||
"message": "Can I do something like this:\n\n https://github.com/openstack/tripleo-heat-templates/commit/e2936d7604b665d35bd8e01f237c0bec0ba205e9#diff-17ccd134e8afc7dbb398001503c8a8206032ea7f1a0282681187a421c65f6b8bR694\n\nHere:\n\n https://review.opendev.org/c/openstack/tripleo-ansible/+/858585/4/tripleo_ansible/roles/tripleo_nova_libvirt/templates/nova_libvirt_init_secret.yaml.j2#9\n\nUsing tripleo_nova_libvirt_ceph_multiconfig_info as defined here:\n\n https://github.com/openstack/tripleo-ansible/blob/master/tripleo_ansible/roles/tripleo_nova_libvirt/tasks/configure.yml#L43-L46\n\n?",
|
||||
"revId": "4fcb0827c9bfd4d8d41a571e81e513647975e67a",
|
||||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -69,6 +69,24 @@
|
|||
"parentUuid": "2f44c20d_c92f25e4",
|
||||
"revId": "6304aa0f86c5bfd2bbf1960db1cec1deae660618",
|
||||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
|
||||
},
|
||||
{
|
||||
"unresolved": true,
|
||||
"key": {
|
||||
"uuid": "f9631065_da805636",
|
||||
"filename": "tripleo_ansible/roles/tripleo_nova_libvirt/files/nova_libvirt_init_secret.yaml",
|
||||
"patchSetId": 1
|
||||
},
|
||||
"lineNbr": 13,
|
||||
"author": {
|
||||
"id": 18002
|
||||
},
|
||||
"writtenOn": "2022-10-07T19:59:36Z",
|
||||
"side": 1,
|
||||
"message": "I found I don\u0027t need to modify tripleo_nova_libvirt/files/nova_libvirt_init_secret.yaml as I had done prior to PS4 since tripleo_nova_libvirt/files/nova_virtsecretd.yaml starts virtsecretd. I just needed to let that happen before calling nova_libvirt_init_secret.sh since that script runs \u0027virsh secret-define\u0027 which requires virtsecretd to be running. Thus I did the reordering in tripleo_nova_libvirt/tasks/run.yml.\n\nI think I might be able to hand case where we create multiple virsh secrets by updating tripleo_nova_libvirt/templates/nova_libvirt_init_secret.yaml.j2 line 9. Thus, I\u0027ve restored tripleo_nova_libvirt/files/nova_libvirt_init_secret.yaml so that it\u0027s unchanged by this patch in PS4.",
|
||||
"parentUuid": "b4689fda_a9c646e9",
|
||||
"revId": "6304aa0f86c5bfd2bbf1960db1cec1deae660618",
|
||||
"serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
|
||||
}
|
||||
]
|
||||
}
|
||||
Loading…
Reference in New Issue