haproxy_patch.txt

gistfile1.txt

diff --git a/app/webroot/js/mvc/controller/nodes/HAProxy.js b/app/webroot/js/mvc/controller/nodes/HAProxy.js
index 59a767b..e90050b 100644
--- a/app/webroot/js/mvc/controller/nodes/HAProxy.js
+++ b/app/webroot/js/mvc/controller/nodes/HAProxy.js
@@ -22,7 +22,8 @@ Ext.define('CmonApp.controller.nodes.HAProxy', {
             command: 'haproxy',
             job_data: {
                 action: action,
-                haproxy_address: view.node.node.hostname,
+                hostname: view.node.node.hostname,
+                port: view.node.node.port,
                 backend_name: record.data.pxname,
                 node_address: record.data.svname
             }
diff --git a/app/webroot/js/mvc/view/loadbalance/HAProxy.js b/app/webroot/js/mvc/view/loadbalance/HAProxy.js
index f036d48..bf48ab0 100644
--- a/app/webroot/js/mvc/view/loadbalance/HAProxy.js
+++ b/app/webroot/js/mvc/view/loadbalance/HAProxy.js
@@ -193,7 +193,7 @@ Ext.define('CmonApp.view.loadbalance.HAProxy', {
                                         items: [
                                             {
                                                 itemId: 'haproxy_address',
-                                                name: 'haproxy_address',
+                                                name: 'hostname',
                                                 xtype: 'combo',
                                                 fieldLabel: 'HAProxy Address',
                                                 labelAlign: 'top',
@@ -215,7 +215,7 @@ Ext.define('CmonApp.view.loadbalance.HAProxy', {
                                             {
                                                 xtype: 'combo',
                                                 itemId: 'haproxy_bind_address',
-                                                name: 'haproxy_bind_address',
+                                                name: 'bind_address',
                                                 width: 250,
                                                 fieldLabel: 'Bind to',
                                                 displayField: 'text',
@@ -380,7 +380,7 @@ Ext.define('CmonApp.view.loadbalance.HAProxy', {
                                 items: [
                                     {
                                         itemId: 'haproxy_address',
-                                        name: 'haproxy_address',
+                                        name: 'hostname',
                                         xtype: 'combo',
                                         fieldLabel: 'HAProxy Address',
                                         labelWidth: 100,
@@ -413,7 +413,7 @@ Ext.define('CmonApp.view.loadbalance.HAProxy', {
                                         listeners: Ext.merge($this.addDataTestIdTrigger('haproxy-existing-port-trigg
er'))
                                     },
                                     {
-                                        name: 'haproxy_admin_user',
+                                        name: 'admin_user',
                                         xtype: 'textfield',
                                         fieldLabel: 'Admin User',
                                         value: 'admin',
@@ -422,7 +422,7 @@ Ext.define('CmonApp.view.loadbalance.HAProxy', {
                                         inputAttrTpl: 'data-test-id="haproxy-existing-admin-user"',
                                     },
                                     {
-                                        name: 'haproxy_admin_pass',
+                                        name: 'admin_password',
                                         xtype: 'textfield',
                                         fieldLabel: 'Admin Password',
                                         value: 'admin',
@@ -441,7 +441,7 @@ Ext.define('CmonApp.view.loadbalance.HAProxy', {
                                         inputAttrTpl: 'data-test-id="haproxy-existing-lb-name"',
                                     },
                                     {
-                                        name: 'haproxy_config',
+                                        name: 'config_file',
                                         xtype: 'textfield',
                                         fieldLabel: 'HAProxy Config',
                                         value: '/etc/haproxy/haproxy.cfg',
@@ -642,7 +642,7 @@ Ext.define('CmonApp.view.loadbalance.HAProxy', {
                     inputAttrTpl: 'data-test-id="haproxy-stats-socket"',
                 },
                     {
-                        name: 'admin_port',
+                        name: 'port',
                         xtype: 'numberfield',
                         labelWidth: 150,
                         width: 280,