Skip to content

Commit 4a37c1f

Browse files
committed
auto detect environment for keystone and ironic sensors
1 parent 8a79219 commit 4a37c1f

File tree

2 files changed

+23
-11
lines changed

2 files changed

+23
-11
lines changed

workflows/openstack/sensors/sensor-ironic-oslo-event.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,16 +106,20 @@ spec:
106106
args:
107107
- "storage_on_server_create.yml"
108108
- --extra-vars
109-
- "project_id={{steps.convert-project-id.outputs.result}} device_id={{workflow.parameters.device_id}} env=dev"
109+
- "project_id={{steps.convert-project-id.outputs.result}} device_id={{workflow.parameters.device_id}}"
110110
- "-i"
111-
- "inventory/uc-dev/01-nautobot.yaml"
111+
- "inventory/in-cluster/01-nautobot.yaml"
112112
- "-vvv"
113113
env:
114114
- name: NAUTOBOT_TOKEN
115115
valueFrom:
116116
secretKeyRef:
117117
key: token
118118
name: nautobot-token
119+
envFrom:
120+
- configMapRef:
121+
name: cluster-metadata
122+
optional: false
119123
- - name: ansible-storage-update
120124
when: "\"{{steps.oslo-events.outputs.parameters.storage}}\" == wanted"
121125
inline:
@@ -125,11 +129,15 @@ spec:
125129
args:
126130
- "storage_update_switches.yml"
127131
- "-i"
128-
- "inventory/uc-dev/01-nautobot.yaml"
132+
- "inventory/in-cluster/01-nautobot.yaml"
129133
- "-vvv"
130134
env:
131135
- name: NAUTOBOT_TOKEN
132136
valueFrom:
133137
secretKeyRef:
134138
key: token
135139
name: nautobot-token
140+
envFrom:
141+
- configMapRef:
142+
name: cluster-metadata
143+
optional: false

workflows/openstack/sensors/sensor-keystone-oslo-event.yaml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,20 @@ spec:
104104
args:
105105
- "storage_on_create_project.yml"
106106
- --extra-vars
107-
- "project_id={{steps.convert-project-id.outputs.result}} env=dev"
107+
- "project_id={{steps.convert-project-id.outputs.result}}"
108108
- "-i"
109-
- "inventory/uc-dev/01-nautobot.yaml"
109+
- "inventory/in-cluster/01-nautobot.yaml"
110110
- "-vvv"
111-
# TODO: this shouldn't be hardcodod to dev, but will work since
112-
# it really talks to https://nautobot-default.svc
113111
env:
114112
- name: NAUTOBOT_TOKEN
115113
valueFrom:
116114
secretKeyRef:
117115
key: token
118116
name: nautobot-token
117+
envFrom:
118+
- configMapRef:
119+
name: cluster-metadata
120+
optional: false
119121
- - name: ansible-create-svm
120122
when: "{{steps.oslo-events.outputs.parameters.svm_created}} == True"
121123
inline:
@@ -125,18 +127,20 @@ spec:
125127
args:
126128
- "storage_on_svm_create.yml"
127129
- --extra-vars
128-
- "svm_name=os-{{workflow.parameters.project_id}} project_id={{steps.convert-project-id.outputs.result}} env=dev"
130+
- "svm_name=os-{{workflow.parameters.project_id}} project_id={{steps.convert-project-id.outputs.result}}"
129131
- "-i"
130-
- "inventory/uc-dev/01-nautobot.yaml"
132+
- "inventory/in-cluster/01-nautobot.yaml"
131133
- "-vvv"
132-
# TODO: this shouldn't be hardcodod to dev, but will work since
133-
# it really talks to https://nautobot-default.svc
134134
env:
135135
- name: NAUTOBOT_TOKEN
136136
valueFrom:
137137
secretKeyRef:
138138
key: token
139139
name: nautobot-token
140+
envFrom:
141+
- configMapRef:
142+
name: cluster-metadata
143+
optional: false
140144
- - name: netapp-configure-net
141145
when: "{{steps.oslo-events.outputs.parameters.svm_created}} == True"
142146
templateRef:

0 commit comments

Comments
 (0)