Merge "nova: ensure /etc/nova/nova.conf.d is always loaded"

nova/templates/bin/_health-probe.py.tpl

@@ -26,7 +26,9 @@ Script returns failure to Kubernetes only when
 sys.stderr.write() writes to pod's events on failures.
 
 Usage example for Nova Compute:
-# python health-probe.py --config-file /etc/nova/nova.conf \
+# python health-probe.py \
+#  --config-file /etc/nova/nova.conf \
+#  --config-dir /etc/nova/nova.conf.d \
 #  --service-queue-name compute
 
 """
@@ -204,7 +206,7 @@ def test_rpc_liveness():
     cfg.CONF.register_cli_opt(cfg.BoolOpt('use-fqdn', default=False,
                                           required=False))
 
-    cfg.CONF(sys.argv[1:])
+    cfg.CONF(sys.argv[1:], project='nova')
 
     log.logging.basicConfig(level=log.{{ .Values.health_probe.logging.level }})
 

nova/templates/bin/_nova-compute-ironic.sh.tpl

@@ -18,4 +18,5 @@ set -ex
 
 exec nova-compute \
       --config-file /etc/nova/nova-compute.conf \
-      --config-file /etc/nova/nova-ironic.conf
+      --config-file /etc/nova/nova-ironic.conf \
+      --config-dir /etc/nova/nova.conf.d

nova/templates/bin/_nova-compute.sh.tpl

@@ -28,5 +28,6 @@ exec nova-compute \
       --config-file /tmp/pod-shared/nova-compute-fqdn.conf \
 {{- end }}
 {{- if .Values.conf.hypervisor.address_search_enabled }}
-      --config-file /tmp/pod-shared/nova-hypervisor.conf
+      --config-file /tmp/pod-shared/nova-hypervisor.conf \
 {{- end }}
+      --config-dir /etc/nova/nova.conf.d

nova/templates/bin/_nova-conductor.sh.tpl

@@ -16,4 +16,5 @@ limitations under the License.
 
 set -x
 exec nova-conductor \
-      --config-file /etc/nova/nova.conf
+      --config-file /etc/nova/nova.conf \
+      --config-dir /etc/nova/nova.conf.d

nova/templates/bin/_nova-console-proxy.sh.tpl

@@ -20,13 +20,16 @@ console_kind="{{- .Values.console.console_kind -}}"
 if [ "${console_kind}" == "novnc" ] ; then
     exec nova-novncproxy \
         --config-file /etc/nova/nova.conf \
-        --config-file /tmp/pod-shared/nova-vnc.ini
+        --config-file /tmp/pod-shared/nova-vnc.ini \
+        --config-dir /etc/nova/nova.conf.d
 elif [ "${console_kind}" == "spice" ] ; then
     exec nova-spicehtml5proxy\
         --config-file /etc/nova/nova.conf \
-        --config-file /tmp/pod-shared/nova-spice.ini
+        --config-file /tmp/pod-shared/nova-spice.ini \
+        --config-dir /etc/nova/nova.conf.d
 elif [ "${console_kind}" == "serial" ] ; then
     exec nova-serialproxy\
         --config-file /etc/nova/nova.conf \
-        --config-file /tmp/pod-shared/nova-serial.ini
+        --config-file /tmp/pod-shared/nova-serial.ini \
-fi
+        --config-dir /etc/nova/nova.conf.d
+fi

nova/templates/bin/_nova-scheduler.sh.tpl

@@ -17,4 +17,5 @@ limitations under the License.
 set -xe
 
 exec nova-scheduler \
-      --config-file /etc/nova/nova.conf
+      --config-file /etc/nova/nova.conf \
+      --config-dir /etc/nova/nova.conf.d

nova/templates/daemonset-compute.yaml

@@ -19,6 +19,8 @@ exec:
     - /tmp/health-probe.py
     - --config-file
     - /etc/nova/nova.conf
+    - --config-dir
+    - /etc/nova/nova.conf.d
     - --service-queue-name
     - compute
     - --liveness-probe
@@ -34,6 +36,8 @@ exec:
     - /tmp/health-probe.py
     - --config-file
     - /etc/nova/nova.conf
+    - --config-dir
+    - /etc/nova/nova.conf.d
     - --service-queue-name
     - compute
     {{- if .Values.pod.use_fqdn.compute }}
@@ -48,6 +52,8 @@ exec:
     - /tmp/health-probe.py
     - --config-file
     - /etc/nova/nova.conf
+    - --config-dir
+    - /etc/nova/nova.conf.d
     - --service-queue-name
     - compute
     - --liveness-probe

nova/templates/deployment-conductor.yaml

@@ -19,6 +19,8 @@ exec:
     - /tmp/health-probe.py
     - --config-file
     - /etc/nova/nova.conf
+    - --config-dir
+    - /etc/nova/nova.conf.d
     - --service-queue-name
     - conductor
     - --liveness-probe
@@ -31,6 +33,8 @@ exec:
     - /tmp/health-probe.py
     - --config-file
     - /etc/nova/nova.conf
+    - --config-dir
+    - /etc/nova/nova.conf.d
     - --service-queue-name
     - conductor
 {{- end }}

nova/templates/deployment-scheduler.yaml

@@ -19,6 +19,8 @@ exec:
     - /tmp/health-probe.py
     - --config-file
     - /etc/nova/nova.conf
+    - --config-dir
+    - /etc/nova/nova.conf.d
     - --service-queue-name
     - scheduler
     - --liveness-probe
@@ -31,6 +33,8 @@ exec:
     - /tmp/health-probe.py
     - --config-file
     - /etc/nova/nova.conf
+    - --config-dir
+    - /etc/nova/nova.conf.d
     - --service-queue-name
     - scheduler
 {{- end }}

releasenotes/notes/nova-7f3dbce1333752b8.yaml

@@ -0,0 +1,5 @@
+---
+nova:
+  - |
+    Ensure that the nova chart always loads config overrides from /etc/nova/nova.conf.d
+...