fix(ovs): Make sure ovs ctl file exist before chow
diff --git a/charts/openvswitch/Chart.yaml b/charts/openvswitch/Chart.yaml
index 639a1b1..abce993 100644
--- a/charts/openvswitch/Chart.yaml
+++ b/charts/openvswitch/Chart.yaml
@@ -9,4 +9,4 @@
sources:
- https://github.com/openvswitch/ovs
- https://opendev.org/openstack/openstack-helm
-version: 0.1.14
+version: 0.1.15
diff --git a/charts/openvswitch/charts/helm-toolkit/requirements.lock b/charts/openvswitch/charts/helm-toolkit/requirements.lock
index 8967de5..aa38470 100644
--- a/charts/openvswitch/charts/helm-toolkit/requirements.lock
+++ b/charts/openvswitch/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
dependencies: []
digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: "2023-06-29T15:31:35.029995827Z"
+generated: "2023-07-08T20:42:05.746624501Z"
diff --git a/charts/openvswitch/requirements.lock b/charts/openvswitch/requirements.lock
index 87c086a..4816c65 100644
--- a/charts/openvswitch/requirements.lock
+++ b/charts/openvswitch/requirements.lock
@@ -3,4 +3,4 @@
repository: file://../helm-toolkit
version: 0.2.53
digest: sha256:ffe3f3b02607e6a035f38f83855988fd8d5c388dbd0bd46e75c22b493a50ede9
-generated: "2023-06-29T15:31:44.911872049Z"
+generated: "2023-07-08T20:42:12.557808714Z"
diff --git a/charts/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl b/charts/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl
index 93aaa60..f85d0c7 100644
--- a/charts/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl
+++ b/charts/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl
@@ -116,6 +116,12 @@
done
PID=$(cat $OVS_PID)
OVS_CTL=/run/openvswitch/ovs-vswitchd.${PID}.ctl
+
+ until [ -S $OVS_CTL ]
+ do
+ echo "Waiting for file $OVS_CTL"
+ sleep 1
+ done
chown {{ .Values.pod.user.nova.uid }}.{{ .Values.pod.user.nova.uid }} ${OVS_CTL}
}
diff --git a/hack/sync-charts.sh b/hack/sync-charts.sh
index 1a360f2..970c0b9 100755
--- a/hack/sync-charts.sh
+++ b/hack/sync-charts.sh
@@ -120,7 +120,7 @@
curl -sL https://tarballs.opendev.org/openstack/openstack-helm/placement-${PLACEMENT_VERSION}.tgz \
| tar -xz -C ${ATMOSPHERE}/charts
-OPEN_VSWITCH_VERSION=0.1.14
+OPEN_VSWITCH_VERSION=0.1.15
curl -sL https://tarballs.opendev.org/openstack/openstack-helm-infra/openvswitch-${OPEN_VSWITCH_VERSION}.tgz \
| tar -xz -C ${ATMOSPHERE}/charts