Skip to content

Commit 74a3210

Browse files
committed
chore(workflows): complete migration away from old svc acct
The old openstack-svc-acct was something hardcoded and this moves us away from using that. Remove the creation of the hardcoded account as well as any references remaining to it. Now we're using a generated account in all cases.
1 parent 6429208 commit 74a3210

9 files changed

Lines changed: 30 additions & 89 deletions

File tree

ansible/roles/keystone_bootstrap/tasks/misc.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,6 @@
1313
# License for the specific language governing permissions and limitations
1414
# under the License.
1515

16-
- name: Create 'argoworkflow' user
17-
openstack.cloud.identity_user:
18-
name: argoworkflow
19-
password: demo
20-
domain: infra
21-
state: present
22-
23-
- name: Set 'argoworkflow' role
24-
openstack.cloud.role_assignment:
25-
domain: infra
26-
user: argoworkflow
27-
project: baremetal
28-
role: admin
29-
state: present
30-
3116
- name: Create 'monitoring' user
3217
openstack.cloud.identity_user:
3318
name: monitoring

components/openstack/templates/secretstore-openstack.yaml.tpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ rules:
2626
- watch
2727
resourceNames:
2828
- baremetal-manage
29-
- svc-acct-argoworkflow
3029
- svc-acct-netapp
3130
- cinder-netapp-config
3231
- admin-keystone-password

components/openstack/templates/svc-acct-argoworkflow.yaml.tpl

Lines changed: 0 additions & 27 deletions
This file was deleted.

workflows/argo-events/kustomization.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ kind: Kustomization
44
resources:
55
- eventbus/eventbus-default.yaml
66
- eventbus/poddisruptionbudget-eventbus-default-pdb.yaml
7-
- secrets/openstack-svc-acct.yaml
87
- secrets/operate-workflow-sa.token.yaml
98
- secrets/baremetal-manage.yaml
109
- eventsources/nautobot-webhook.yaml

workflows/argo-events/secrets/openstack-svc-acct.yaml

Lines changed: 0 additions & 30 deletions
This file was deleted.

workflows/argo-events/workflowtemplates/alert-automation-neutron-agent-down.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,12 @@ spec:
4848
value: understack
4949
volumeMounts:
5050
- mountPath: /etc/openstack
51-
name: openstack-svc-acct
51+
name: baremetal-manage
5252
readOnly: true
5353
volumes:
54-
- name: openstack-svc-acct
54+
- name: baremetal-manage
5555
secret:
56-
secretName: openstack-svc-acct
56+
secretName: baremetal-manage
57+
items:
58+
- key: clouds.yaml
59+
path: clouds.yaml

workflows/argo-events/workflowtemplates/keystone-event-project.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,15 @@ spec:
4040
name: nb-token
4141
readOnly: true
4242
- mountPath: /etc/openstack
43-
name: openstack-svc-acct
43+
name: baremetal-manage
4444
readOnly: true
4545
volumes:
4646
- name: nb-token
4747
secret:
4848
secretName: nautobot-token
49-
- name: openstack-svc-acct
49+
- name: baremetal-manage
5050
secret:
51-
secretName: openstack-svc-acct
51+
secretName: baremetal-manage
52+
items:
53+
- key: clouds.yaml
54+
path: clouds.yaml

workflows/argo-events/workflowtemplates/neutron-event-network-segment-range.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,15 @@ spec:
5252
name: nb-token
5353
readOnly: true
5454
- mountPath: /etc/openstack
55-
name: openstack-svc-acct
55+
name: baremetal-manage
5656
readOnly: true
5757
volumes:
5858
- name: nb-token
5959
secret:
6060
secretName: nautobot-token
61-
- name: openstack-svc-acct
61+
- name: baremetal-manage
6262
secret:
63-
secretName: openstack-svc-acct
63+
secretName: baremetal-manage
64+
items:
65+
- key: clouds.yaml
66+
path: clouds.yaml

workflows/argo-events/workflowtemplates/reclean-server.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,15 @@ spec:
5959
value: understack
6060
volumeMounts:
6161
- mountPath: /etc/openstack
62-
name: openstack-svc-acct
62+
name: baremetal-manage
6363
readOnly: true
6464
volumes:
65-
- name: openstack-svc-acct
65+
- name: baremetal-manage
6666
secret:
67-
secretName: openstack-svc-acct
67+
secretName: baremetal-manage
68+
items:
69+
- key: clouds.yaml
70+
path: clouds.yaml
6871
- name: openstack-state-cmd
6972
inputs:
7073
parameters:
@@ -87,9 +90,12 @@ spec:
8790
value: understack
8891
volumeMounts:
8992
- mountPath: /etc/openstack
90-
name: openstack-svc-acct
93+
name: baremetal-manage
9194
readOnly: true
9295
volumes:
93-
- name: openstack-svc-acct
96+
- name: baremetal-manage
9497
secret:
95-
secretName: openstack-svc-acct
98+
secretName: baremetal-manage
99+
items:
100+
- key: clouds.yaml
101+
path: clouds.yaml

0 commit comments

Comments
 (0)