From 61c167d3590a93a652980af5a3c352406eef3608 Mon Sep 17 00:00:00 2001 From: Chris Wedgwood Date: Mon, 1 Feb 2021 17:50:38 -0600 Subject: [PATCH] [nova,cinder] Use HostToContainer mount propagation Bidirectional mount propagation doesn't work as expected, HostToContainer does and is the safer option for now. Change-Id: Ia0b0ab1a74991745cd74d3629d23f86bd8ff5296 --- cinder/Chart.yaml | 2 +- cinder/templates/deployment-backup.yaml | 4 ++-- cinder/templates/deployment-volume.yaml | 4 ++-- nova/Chart.yaml | 2 +- nova/templates/daemonset-compute.yaml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml index 511c86c588..4577d8a496 100644 --- a/cinder/Chart.yaml +++ b/cinder/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Cinder name: cinder -version: 0.1.8 +version: 0.1.9 home: https://docs.openstack.org/cinder/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png sources: diff --git a/cinder/templates/deployment-backup.yaml b/cinder/templates/deployment-backup.yaml index 6ec3f478cc..fb7806ae85 100755 --- a/cinder/templates/deployment-backup.yaml +++ b/cinder/templates/deployment-backup.yaml @@ -251,14 +251,14 @@ spec: - name: host-dev mountPath: /dev {{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "10" ) }} - mountPropagation: Bidirectional + mountPropagation: HostToContainer {{- end }} - name: runlock mountPath: /run/lock - name: etciscsi mountPath: /etc/iscsi {{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "10" ) }} - mountPropagation: Bidirectional + mountPropagation: HostToContainer {{- end }} - name: usrlocalsbin mountPath: /usr/local/sbin diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml index 629f059e96..6bf3a91d8f 100755 --- a/cinder/templates/deployment-volume.yaml +++ b/cinder/templates/deployment-volume.yaml @@ -234,14 +234,14 @@ spec: - name: host-dev mountPath: /dev {{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "10" ) }} - mountPropagation: Bidirectional + mountPropagation: HostToContainer {{- end }} - name: runlock mountPath: /run/lock - name: etciscsi mountPath: /etc/iscsi {{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "10" ) }} - mountPropagation: Bidirectional + mountPropagation: HostToContainer {{- end }} - name: usrlocalsbin mountPath: /usr/local/sbin diff --git a/nova/Chart.yaml b/nova/Chart.yaml index 852c465956..6f7892d2c4 100644 --- a/nova/Chart.yaml +++ b/nova/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Nova name: nova -version: 0.1.9 +version: 0.1.10 home: https://docs.openstack.org/nova/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png sources: diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml index 5821fa85e3..b9346789d5 100644 --- a/nova/templates/daemonset-compute.yaml +++ b/nova/templates/daemonset-compute.yaml @@ -372,12 +372,12 @@ spec: - name: etciscsi mountPath: /etc/iscsi {{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "10" ) }} - mountPropagation: Bidirectional + mountPropagation: HostToContainer {{- end }} - name: dev mountPath: /dev {{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "10" ) }} - mountPropagation: Bidirectional + mountPropagation: HostToContainer {{- end }} - name: nova-bin mountPath: /usr/local/sbin/iscsiadm