Skip to content

Commit 226b9ff

Browse files
jamepark4sdatko
andcommitted
Update Nodeset2 to intake nova-extra configuration
Also move existing nova-extra-config from service-values to the edpm-nodeset-values-post-ceph. This allows setting dedicated extra config for nova-compute for each nova cell. Before this change, the possibility of setting extra configuration got broken, as the nova-extra-config resource was generated in dt/uni05epsilon/edpm-post-ceph/nodeset2/kustomization.yaml with default value again, shadowing the desired value that was set in the previous deployment stage. Co-Authored-By: Szymon Datko <[email protected]> Co-Authored-By: James Parker <[email protected]>
1 parent faaaca0 commit 226b9ff

File tree

5 files changed

+23
-4
lines changed

5 files changed

+23
-4
lines changed

dt/uni05epsilon/edpm-post-ceph/nodeset/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ replacements:
360360
#
361361
- source:
362362
kind: ConfigMap
363-
name: service-values
363+
name: edpm-nodeset-values-post-ceph
364364
fieldPath: data.nova-extra-config
365365
targets:
366366
- select:

dt/uni05epsilon/edpm-post-ceph/nodeset2/kustomization.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,19 @@ replacements:
4646
- spec.services
4747
options:
4848
create: true
49+
50+
#
51+
# Nova
52+
#
53+
- source:
54+
kind: ConfigMap
55+
name: edpm-nodeset2-values-post-ceph
56+
fieldPath: data.nova-extra-config
57+
targets:
58+
- select:
59+
kind: ConfigMap
60+
name: nova-custom-config
61+
fieldPaths:
62+
- data.55-nova-extra\.conf
63+
options:
64+
create: true

examples/dt/uni05epsilon/nodeset2/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,6 @@ data:
3030
- neutron-metadata
3131
- libvirt
3232
- nova-custom-cell2
33+
34+
nova-extra-config: |
35+
# Additional overrides that can be set in environment-specific cases

examples/dt/uni05epsilon/service-values.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,5 @@ data:
144144
rabbitmq-cell2:
145145
replicas: 3
146146

147-
nova-extra-config: |
148-
# Additional overrides that can be set in environment-specific cases
149-
150147
swift:
151148
enabled: true

examples/dt/uni05epsilon/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,6 @@ data:
3030
- neutron-metadata
3131
- libvirt
3232
- nova-custom
33+
34+
nova-extra-config: |
35+
# Additional overrides that can be set in environment-specific cases

0 commit comments

Comments
 (0)