Merge pull request #1018 from tgooding/master

Add volumegroup and tcp transport options
IBM · Feb 10, 2022 · 3d56e5b · 3d56e5b
2 parents 0b3d0c0 + 21e6cda
commit 3d56e5b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 0 deletions.
diff --git a/bb/ansible/bbserverIPlist.yml b/bb/ansible/bbserverIPlist.yml
@@ -63,6 +63,14 @@
 
 - hosts: compute server
   tasks:
+  - name: Create /etc/ibm directory if it does not exist
+    file:   
+      path: /etc/ibm
+      state: directory
+      mode: '0755'
+      owner: root
+      group: root
+
   - name: Copy server ip list to compute/server  nodes
     copy:
         src: /tmp/serverlist

diff --git a/bb/ansible/nodelist.yml b/bb/ansible/nodelist.yml
@@ -45,6 +45,14 @@
 
 - hosts: compute
   tasks:
+  - name: Create /etc/ibm directory if it does not exist
+    file:   
+      path: /etc/ibm
+      state: directory
+      mode: '0755'
+      owner: root
+      group: root
+
   - name: Copy nodelist to compute nodes
     copy:
         src: /tmp/nodelist

diff --git a/bb/scripts/bbactivate.pl b/bb/scripts/bbactivate.pl
@@ -140,6 +140,7 @@ sub writeConfiguration
     "nodelist=s"      => \$CFG{"nodelist"},
     "esslist=s"       => \$CFG{"esslist"},
     "configtempl=s"   => \$CFG{"configtempl"},
+    "volumegroup=s"   => \$CFG{"volumegroup"},
     "nvmetempl=s"     => \$CFG{"nvmetempl"},
     "outputconfig=s"  => \$CFG{"outputconfig"},
     "interfacename=s" => \$CFG{"interfacename"},
@@ -246,6 +247,7 @@ sub setDefaults
     &def("envdir",           1, "HOME");
     &def("lsfdir",           1, "");
     &def("skip",             1, "");
+    &def("volumegroup",      1, "bb");
     &def("configtempl",      2, "$SCRIPTPATH/bb.cfg");
     &def("nvmetempl",        2, "$SCRIPTPATH/nvmet.json");
 
@@ -417,6 +419,8 @@ sub makeProxyConfigFile
     {
         $json->{"bb"}{"proxy"}{"controller"} = "csm";
     }
+    $json->{"bb"}{"proxy"}{"volumegroup"} = $CFG{"volumegroup"};
+
     $json->{"bb"}{"cmd"}{"controller"} = "none";    # disable on compute nodes
 
     $json->{"bb"}{"server0"}{"sslcertif"} = $CFG{"sslcert"} if($CFG{"sslcert"} ne "default");

diff --git a/bb/src/serial.cc b/bb/src/serial.cc
@@ -172,6 +172,10 @@ void look4NVMFinitiator(){
                             {
                                 files.push_back("address");
                             }
+                            else if(line == string("tcp"))
+                            {
+                                files.push_back("address");
+                            }
                         }
                         if(files[index] == "address")
                         {
@@ -296,6 +300,11 @@ void look4NVMFtargetDevices(){
                                     files.push_back("addr_traddr");
                                     files.push_back("addr_trsvcid");
                                 }
+                                else if(line == string("tcp"))
+                                {
+                                    files.push_back("addr_traddr");
+                                    files.push_back("addr_trsvcid");
+                                }
                             }
                             nvmet_pseudoserial = nvmet_pseudoserial + "," + line;
                         }