added ceph_nfs_floating_ip_interface option

45Drives · Jul 5, 2022 · 3554d02 · 3554d02
1 parent 92dc810
commit 3554d02
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,3 @@
-## Cockpit Ceph-Deploy 1.0.3-4
+## Cockpit Ceph-Deploy 1.0.3-5
 
-* updated query selector for multi-device-path options
+* added option for nfss to set the interface used for floating ip. ceph_nfs_floating_ip_interface
diff --git a/manifest.json b/manifest.json
@@ -4,7 +4,7 @@
     "title": "Cockpit Ceph-Deploy",
     "prerelease": true,
     "version": "1.0.3",
-    "buildVersion": "4",
+    "buildVersion": "5",
     "author": "Mark Hooper <[email protected]>",
     "url": "https://github.com/45Drives/cockpit-ceph-deploy",
     "category": "utils",
@@ -53,7 +53,7 @@
     "changelog": {
         "urgency": "medium",
         "version": "1.0.3",
-        "buildVersion": "4",
+        "buildVersion": "5",
         "ignore": [],
         "date": null,
         "packager": "Mark Hooper <[email protected]>",

diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec
@@ -89,6 +89,8 @@ fi
 /usr/share/cockpit/ceph-deploy/*
 
 %changelog
+* Tue Jul 05 2022 Mark Hooper <[email protected]> 1.0.3-5
+- added option for nfss to set the interface used for floating ip. ceph_nfs_floating_ip_interface
 * Fri Jun 24 2022 Mark Hooper <[email protected]> 1.0.3-4
 - updated query selector for multi-device-path options
 * Fri Jun 10 2022 Mark Hooper <[email protected]> 1.0.3-3

diff --git a/packaging/focal/changelog b/packaging/focal/changelog
@@ -1,3 +1,9 @@
+cockpit-ceph-deploy (1.0.3-5focal) focal; urgency=medium
+
+  * added option for nfss to set the interface used for floating ip. ceph_nfs_floating_ip_interface
+
+ -- Mark Hooper <[email protected]>  Tue, 05 Jul 2022 13:58:27 -0300
+
 cockpit-ceph-deploy (1.0.3-4focal) focal; urgency=medium
 
   * updated query selector for multi-device-path options

diff --git a/src/fakeroot/usr/share/cockpit/ceph-deploy/ceph-ansible-files/nfss-default.yml b/src/fakeroot/usr/share/cockpit/ceph-deploy/ceph-ansible-files/nfss-default.yml
@@ -88,6 +88,7 @@ pcmk_user: hacluster
 
 ceph_nfs_floating_ip_address: '192.168.122.41'
 ceph_nfs_floating_ip_cidr: '16'
+ceph_nfs_floating_ip_interface: 'eno1'
 
 
 ####################

diff --git a/src/fakeroot/usr/share/cockpit/ceph-deploy/ceph-deploy.js b/src/fakeroot/usr/share/cockpit/ceph-deploy/ceph-deploy.js
@@ -671,6 +671,18 @@ let g_option_scheme = {
                 input_type: "text",
                 default_value: "",
               },
+              {
+                option_name: "ceph_nfs_floating_ip_interface",
+                radio_option_name: "ceph_nfs_floating_ip_interface",
+                option_format: "default",
+                optional: true,
+                label: "ceph_nfs_floating_ip_interface",
+                feedback: true,
+                feedback_type: "name",
+                help: "",
+                input_type: "text",
+                default_value: "",
+              },
             ],
           },
         ],

diff --git a/src/fakeroot/usr/share/cockpit/ceph-deploy/helper_scripts/core_params b/src/fakeroot/usr/share/cockpit/ceph-deploy/helper_scripts/core_params
@@ -106,6 +106,7 @@ class Nfss:
     nfs_active_passive: bool = False
     ceph_nfs_floating_ip_address: str = ""
     ceph_nfs_floating_ip_cidr: str = ""
+    ceph_nfs_floating_ip_interface: str = ""
     ceph_nfs_rados_backend_driver: str = ""
 
     def load_dictionary(self, dict_variable: dict):

diff --git a/sync_ceph_deploy.sh b/sync_ceph_deploy.sh
@@ -1,4 +1,4 @@
-TEST_SERVER_A="rockinator1"
+TEST_SERVER_A="ubuntuosd1"
 COCKPIT_MODULE="ceph-deploy"
 
 # Test Server A