service ip has higher priority than private ip when file/app is played

porch/api/app/bizlogic.py

@@ -345,7 +345,7 @@ def _bg_file_distribute(data, s_logfile):
         with open(s_logfile, 'w+') as f:
         with open(s_logfile, 'w+') as f:
             f.write('BEGIN: ' + datetime.now().isoformat() + "\n")
             f.write('BEGIN: ' + datetime.now().isoformat() + "\n")
             for machine in data['machines']:
             for machine in data['machines']:
-                s_cmd = "rsync -av -e 'ssh {}' ".format(sshoptions) + \
+                s_cmd = "rsync -rlptDv -e 'ssh {}' ".format(sshoptions) + \
                         "/porch_files/{}/ root@{}:/"\
                         "/porch_files/{}/ root@{}:/"\
                         .format(data['name'], machine)
                         .format(data['name'], machine)
                 f.write(s_cmd + "\n")
                 f.write(s_cmd + "\n")

porch/templates/pxelinuxcfg.j2

@@ -2,4 +2,4 @@ default porch-generated
 
 
 label porch-generated
 label porch-generated
 kernel {{ data['fai_kernel_url'] }}
 kernel {{ data['fai_kernel_url'] }}
-append initrd={{ data['fai_initrd_url'] }} ip=dhcp  root=live:{{ data['fai_squash_url'] }} aufs  FAI_FLAGS=verbose,sshd,reboot FAI_CONFIG_SRC={{ data['fai_config_url'] }} FAI_ACTION=install {% if data['type'] == 'PM' %} console=tty0 console=ttyS0,115200n8 {% endif %} net.ifnames=0 edd=off
+append initrd={{ data['fai_initrd_url'] }} ip=eth0:dhcp rd.shell=1 rd.net.dhcp.retry=3 rd.net.timeout.ifup=60 rd.net.timeout.carrier=30 root=live:{{ data['fai_squash_url'] }} aufs  FAI_FLAGS=verbose,sshd,reboot FAI_CONFIG_SRC={{ data['fai_config_url'] }} FAI_ACTION=install {% if data['type'] == 'PM' %} console=tty0 console=ttyS0,115200n8 {% endif %} net.ifnames=0 biosdevname=0 edd=off

quasar/src/components/app/File.vue

@@ -232,7 +232,7 @@ export default {
         result.forEach(function (element) {
         result.forEach(function (element) {
           self.sections[element.section].push({
           self.sections[element.section].push({
             name: element.name,
             name: element.name,
-            ip: element.ip
+            ip: element.svc_ip ? element.svc_ip : element.ip
           })
           })
         })
         })
       }, response => {
       }, response => {

quasar/src/components/play/List.vue

@@ -287,7 +287,7 @@ export default {
         result.forEach(function (element) {
         result.forEach(function (element) {
           self.sections[element.section].push({
           self.sections[element.section].push({
             name: element.name,
             name: element.name,
-            ip: element.ip
+            ip: element.svc_ip ? element.svc_ip : element.ip
           })
           })
         })
         })
       }, response => {
       }, response => {