Skip to content

Commit aa54404

Browse files
authored
Merge pull request #1359 from rackerlabs/update-enroll
feat: update enroll and resource class assignment to new hardware categorization
2 parents d1b0fb0 + 9f90783 commit aa54404

File tree

37 files changed

+730
-2209
lines changed

37 files changed

+730
-2209
lines changed

.github/workflows/containers.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ jobs:
124124
# if you add a container here, add it to the 'clean_containers' job below
125125
container:
126126
- name: ironic-nautobot-client
127-
- name: nova-flavors
128127
- name: ansible
129128
- name: understack-tests
130129

@@ -186,7 +185,6 @@ jobs:
186185
- openstack-client
187186
- dnsmasq
188187
- ironic-nautobot-client
189-
- nova-flavors
190188
- ansible
191189
- understack-tests
192190

components/ironic/values.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ conf:
8888
loader_file_paths: "snponly.efi:/usr/lib/ipxe/snponly.efi"
8989
inspector:
9090
extra_kernel_params: ipa-collect-lldp=1
91-
hooks: "$default_hooks,parse-lldp,local-link-connection,physical-network"
91+
hooks: "$default_hooks,parse-lldp,local-link-connection,physical-network,resource-class"
9292
# enable sensors and metrics for redfish metrics - https://docs.openstack.org/ironic/latest/admin/drivers/redfish/metrics.html
9393
sensor_data:
9494
send_sensor_data: true
@@ -217,6 +217,8 @@ pod:
217217
mountPath: /var/lib/dnsmasq/
218218
- name: understack-data
219219
mountPath: /var/lib/understack
220+
- name: device-types
221+
mountPath: /var/lib/understack/device-types
220222
- name: ironic-etc-snippets
221223
mountPath: /etc/ironic/ironic.conf.d
222224
readOnly: true
@@ -230,6 +232,9 @@ pod:
230232
- name: understack-data
231233
persistentVolumeClaim:
232234
claimName: understack-data
235+
- name: device-types
236+
configMap:
237+
name: device-types
233238
- name: ironic-etc-snippets
234239
projected:
235240
sources:
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
apiVersion: generators.external-secrets.io/v1alpha1
3+
kind: Password
4+
metadata:
5+
name: "baremetal-manage-{{ .Values.regionName }}"
6+
spec:
7+
length: 32
8+
digits: 6
9+
symbols: 4
10+
symbolCharacters: "~!@#$%^*()_+-={}[]<>?"
11+
---
12+
apiVersion: external-secrets.io/v1
13+
kind: ExternalSecret
14+
metadata:
15+
name: "baremetal-manage-{{ .Values.regionName }}"
16+
spec:
17+
refreshInterval: 20160m
18+
target:
19+
name: baremetal-manage
20+
template:
21+
engineVersion: v2
22+
type: Opaque
23+
metadata:
24+
labels:
25+
understack.rackspace.com/keystone-role: infra-readwrite
26+
understack.rackspace.com/keystone-user: "baremetal-manage-{{ .Values.regionName }}"
27+
data:
28+
password: "{{ `{{ .password }}` }}"
29+
clouds.yaml: |
30+
clouds:
31+
understack:
32+
auth:
33+
auth_url: "{{ .Values.keystoneUrl }}"
34+
user_domain_name: "service"
35+
username: "baremetal-manage-{{ .Values.regionName }}"
36+
password: "{{ `{{ .password }}` }}"
37+
project_domain_name: "infra"
38+
project_name: "baremetal"
39+
region_name: "{{ .Values.regionName }}"
40+
interface: "public"
41+
identity_api_version: 3
42+
dataFrom:
43+
- sourceRef:
44+
generatorRef:
45+
apiVersion: generators.external-secrets.io/v1alpha1
46+
kind: Password
47+
name: "baremetal-manage-{{ .Values.regionName }}"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ rules:
2525
- list
2626
- watch
2727
resourceNames:
28+
- baremetal-manage
2829
- svc-acct-argoworkflow
2930
- svc-acct-netapp
3031
- cinder-netapp-config

containers/nova-flavors/Dockerfile

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

operators/nova-flavors/.env-example

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

operators/nova-flavors/README.md

Whitespace-only changes.

operators/nova-flavors/nova_flavors/__init__.py

Whitespace-only changes.

operators/nova-flavors/nova_flavors/flavor_synchronizer.py

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

operators/nova-flavors/nova_flavors/logger.py

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

0 commit comments

Comments
 (0)