From d99ac61a0d88bbd5b6e32e5996d4f43394bd4f10 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Fri, 25 Aug 2017 17:20:18 -0500
Subject: [PATCH] Nova: Mount machine id into compute daemonsets
This PS mounts the machine id into the compute daemonsets. It is
required for newer verions of libvirt and nova.
Change-Id: I75d3ebe670fe1372eb4b6a7fc90102bee69465bf
---
nova/templates/daemonset-compute.yaml | 6 ++++++
nova/templates/daemonset-libvirt.yaml | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml
index a0f5443103..5590f8def9 100644
--- a/nova/templates/daemonset-compute.yaml
+++ b/nova/templates/daemonset-compute.yaml
@@ -187,6 +187,9 @@ spec:
mountPath: /sys/fs/cgroup
- name: pod-shared
mountPath: /tmp/pod-shared
+ - name: machine-id
+ mountPath: /etc/machine-id
+ readOnly: true
{{ if $mounts_nova_compute.volumeMounts }}{{ toYaml $mounts_nova_compute.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: nova-bin
@@ -225,5 +228,8 @@ spec:
path: /sys/fs/cgroup
- name: pod-shared
emptyDir: {}
+ - name: machine-id
+ hostPath:
+ path: /etc/machine-id
{{ if $mounts_nova_compute.volumes }}{{ toYaml $mounts_nova_compute.volumes | indent 8 }}{{ end }}
{{- end }}
diff --git a/nova/templates/daemonset-libvirt.yaml b/nova/templates/daemonset-libvirt.yaml
index 623caa3fe5..829c7d8f28 100644
--- a/nova/templates/daemonset-libvirt.yaml
+++ b/nova/templates/daemonset-libvirt.yaml
@@ -139,6 +139,9 @@ spec:
mountPath: /dev
- name: cgroup
mountPath: /sys/fs/cgroup
+ - name: machine-id
+ mountPath: /etc/machine-id
+ readOnly: true
{{- if .Values.ceph.enabled }}
- name: etcceph
mountPath: /etc/ceph
@@ -194,5 +197,8 @@ spec:
- name: cgroup
hostPath:
path: /sys/fs/cgroup
+ - name: machine-id
+ hostPath:
+ path: /etc/machine-id
{{ if $mounts_nova_libvirt.volumes }}{{ toYaml $mounts_nova_libvirt.volumes | indent 8 }}{{ end }}
{{- end }}