X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-stx%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppetlabs-lvm%2F0003-US94222-Persistent-Dev-Naming.patch;fp=meta-stx%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppetlabs-lvm%2F0003-US94222-Persistent-Dev-Naming.patch;h=a1ddc0d8fddd01806884f59ad0c9f339031e70f6;hb=57fdea704bd62af847872c40508f00aa1d7cac60;hp=0000000000000000000000000000000000000000;hpb=f23f21bccfb750b9e30141fd9676515215ffbc4e;p=pti%2Frtp.git

diff --git a/meta-stx/recipes-support/puppet/files/puppetlabs-lvm/0003-US94222-Persistent-Dev-Naming.patch b/meta-stx/recipes-support/puppet/files/puppetlabs-lvm/0003-US94222-Persistent-Dev-Naming.patch
new file mode 100644
index 0000000..a1ddc0d
--- /dev/null
+++ b/meta-stx/recipes-support/puppet/files/puppetlabs-lvm/0003-US94222-Persistent-Dev-Naming.patch
@@ -0,0 +1,25 @@
+From b05de190832bba08ce410c267c4b2f8a74916f7a Mon Sep 17 00:00:00 2001
+From: Robert Church <robert.church@windriver.com>
+Date: Wed, 1 Mar 2017 09:12:34 +0000
+Subject: [PATCH] US94222: Persistent Dev Naming
+
+---
+ packstack/puppet/modules/lvm/lib/puppet/provider/volume_group/lvm.rb | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/packstack/puppet/modules/lvm/lib/puppet/provider/volume_group/lvm.rb b/packstack/puppet/modules/lvm/lib/puppet/provider/volume_group/lvm.rb
+index 3d54dba..04dea64 100644
+--- a/packstack/puppet/modules/lvm/lib/puppet/provider/volume_group/lvm.rb
++++ b/packstack/puppet/modules/lvm/lib/puppet/provider/volume_group/lvm.rb
+@@ -81,7 +81,7 @@ Puppet::Type.type(:volume_group).provide :lvm do
+ 
+     def physical_volumes
+         if @resource[:createonly].to_s == "false" || ! vgs(@resource[:name])
+-          lines = pvs('-o', 'pv_name,vg_name', '--separator', ',')
++          lines = `pvs -o pv_name,vg_name --separator ',' | awk -F ',' 'NR>1{cmd="find -L /dev/disk/by-path/ -samefile" $1; cmd | getline $1;print $1 "," $2; next};{print}'`
+           lines.split(/\n/).grep(/,#{@resource[:name]}$/).map { |s|
+             s.split(/,/)[0].strip
+           }
+-- 
+1.8.3.1
+