单机功能测试现场部署脚本定稿

29 files changed, 147 insertions, 843 deletions

diff --git a/.vscode/ftp-kr.diff.site.yml b/.vscode/ftp-kr.diff.site.yml
deleted file mode 100644
index e69de29..0000000
--- a/.vscode/ftp-kr.diff.site.yml
+++ /dev/null
diff --git a/.vscode/ftp-kr.json b/.vscode/ftp-kr.json
deleted file mode 100644
index 1043174..0000000
--- a/.vscode/ftp-kr.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "host": "192.168.10.38",
-    "username": "root",
-    "password": "111111",
-    "remotePath": "/root/cuiyiming/tsg_scripts",
-    "protocol": "sftp",
-    "port": 22,
-    "fileNameEncoding": "utf8",
-    "autoUpload": true,
-    "autoDelete": false,
-    "autoDownload": false,
-    "ignore": [
-        ".git",
-        "/.vscode"
-    ]
-}
\ No newline at end of file
diff --git a/.vscode/ftp-kr.sync.cache.json b/.vscode/ftp-kr.sync.cache.json
deleted file mode 100644
index 0a20645..0000000
--- a/.vscode/ftp-kr.sync.cache.json
+++ /dev/null
@@ -1,731 +0,0 @@
-{
-  "sftp://192.168.10.38:22@root": {
-    "root": {
-      "cuiyiming": {
-        "3rd-packages": {
-          "ansible": {
-            "PyYAML-3.10-11.el7.x86_64.rpm": {
-              "type": "-",
-              "size": 156952,
-              "lmtime": 1561115765594,
-              "modified": false
-            },
-            "ansible-2.4.2.0-2.el7.noarch.rpm": {
-              "type": "-",
-              "size": 7968876,
-              "lmtime": 1561115765649,
-              "modified": false
-            },
-            "libyaml-0.1.4-11.el7_0.x86_64.rpm": {
-              "type": "-",
-              "size": 56068,
-              "lmtime": 1561115765656,
-              "modified": false
-            },
-            "make-3.82-23.el7.x86_64.rpm": {
-              "type": "-",
-              "size": 430540,
-              "lmtime": 1561115765664,
-              "modified": false
-            },
-            "openssl-1.0.2k-16.el7_6.1.x86_64.rpm": {
-              "type": "-",
-              "size": 504632,
-              "lmtime": 1561115765677,
-              "modified": false
-            },
-            "openssl-libs-1.0.2k-16.el7_6.1.x86_64.rpm": {
-              "type": "-",
-              "size": 1251908,
-              "lmtime": 1561115765699,
-              "modified": false
-            },
-            "python-babel-0.9.6-8.el7.noarch.rpm": {
-              "type": "-",
-              "size": 1426348,
-              "lmtime": 1561115765734,
-              "modified": false
-            },
-            "python-backports-1.0-8.el7.x86_64.rpm": {
-              "type": "-",
-              "size": 5932,
-              "lmtime": 1561115765736,
-              "modified": false
-            },
-            "python-backports-ssl_match_hostname-3.5.0.1-1.el7.noarch.rpm": {
-              "type": "-",
-              "size": 12896,
-              "lmtime": 1561115765738,
-              "modified": false
-            },
-            "python-cffi-1.6.0-5.el7.x86_64.rpm": {
-              "type": "-",
-              "size": 223012,
-              "lmtime": 1561115765744,
-              "modified": false
-            },
-            "python-enum34-1.0.4-1.el7.noarch.rpm": {
-              "type": "-",
-              "size": 53496,
-              "lmtime": 1561115765746,
-              "modified": false
-            },
-            "python-httplib2-0.9.2-1.el7.noarch.rpm": {
-              "type": "-",
-              "size": 117968,
-              "lmtime": 1561115765749,
-              "modified": false
-            },
-            "python-idna-2.4-1.el7.noarch.rpm": {
-              "type": "-",
-              "size": 95952,
-              "lmtime": 1561115765754,
-              "modified": false
-            },
-            "python-ipaddress-1.0.16-2.el7.noarch.rpm": {
-              "type": "-",
-              "size": 35176,
-              "lmtime": 1561115765756,
-              "modified": false
-            },
-            "python-jinja2-2.7.2-3.el7_6.noarch.rpm": {
-              "type": "-",
-              "size": 530920,
-              "lmtime": 1561115765763,
-              "modified": false
-            },
-            "python-markupsafe-0.11-10.el7.x86_64.rpm": {
-              "type": "-",
-              "size": 25792,
-              "lmtime": 1561115765765,
-              "modified": false
-            },
-            "python-paramiko-2.1.1-9.el7.noarch.rpm": {
-              "type": "-",
-              "size": 275112,
-              "lmtime": 1561115765770,
-              "modified": false
-            },
-            "python-passlib-1.6.5-2.el7.noarch.rpm": {
-              "type": "-",
-              "size": 500108,
-              "lmtime": 1561115765776,
-              "modified": false
-            },
-            "python-ply-3.4-11.el7.noarch.rpm": {
-              "type": "-",
-              "size": 125732,
-              "lmtime": 1561115765779,
-              "modified": false
-            },
-            "python-pycparser-2.14-1.el7.noarch.rpm": {
-              "type": "-",
-              "size": 106984,
-              "lmtime": 1561115765781,
-              "modified": false
-            },
-            "python-setuptools-0.9.8-7.el7.noarch.rpm": {
-              "type": "-",
-              "size": 406404,
-              "lmtime": 1561115765786,
-              "modified": false
-            },
-            "python-six-1.9.0-2.el7.noarch.rpm": {
-              "type": "-",
-              "size": 29404,
-              "lmtime": 1561115765787,
-              "modified": false
-            },
-            "python2-cryptography-1.7.2-2.el7.x86_64.rpm": {
-              "type": "-",
-              "size": 514504,
-              "lmtime": 1561115765792,
-              "modified": false
-            },
-            "python2-jmespath-0.9.0-3.el7.noarch.rpm": {
-              "type": "-",
-              "size": 39576,
-              "lmtime": 1561115765796,
-              "modified": false
-            },
-            "python2-pyasn1-0.1.9-7.el7.noarch.rpm": {
-              "type": "-",
-              "size": 102132,
-              "lmtime": 1561115765799,
-              "modified": false
-            },
-            "sshpass-1.06-2.el7.x86_64.rpm": {
-              "type": "-",
-              "size": 21896,
-              "lmtime": 1561115765800,
-              "modified": false
-            }
-          },
-          "dkms": {
-            "dkms-2.7.1-1.el7.noarch.rpm": {
-              "type": "-",
-              "size": 76956,
-              "lmtime": 1561115765803,
-              "modified": false
-            },
-            "elfutils-libelf-devel-0.172-2.el7.x86_64.rpm": {
-              "type": "-",
-              "size": 39872,
-              "lmtime": 1561115765804,
-              "modified": false
-            },
-            "which-2.20-7.el7.x86_64.rpm": {
-              "type": "-",
-              "size": 41716,
-              "lmtime": 1561115765805,
-              "modified": false
-            },
-            "zlib-1.2.7-18.el7.x86_64.rpm": {
-              "type": "-",
-              "size": 91960,
-              "lmtime": 1561115765807,
-              "modified": false
-            },
-            "zlib-devel-1.2.7-18.el7.x86_64.rpm": {
-              "type": "-",
-              "size": 51128,
-              "lmtime": 1561115765808,
-              "modified": false
-            }
-          }
-        },
-        "hosts.hyadc": {
-          "type": "-",
-          "size": 87,
-          "lmtime": 1561115765809,
-          "modified": false
-        },
-        "hosts.ycxadc": {
-          "type": "-",
-          "size": 174,
-          "lmtime": 1561115765809,
-          "modified": false
-        },
-        "roles": {
-          "framework": {
-            "files": {
-              "dkms": {
-                "dkms-2.7.1-1.el7.noarch.rpm": {
-                  "type": "-",
-                  "size": 76956,
-                  "lmtime": 1561115765813,
-                  "modified": false
-                },
-                "elfutils-libelf-devel-0.172-2.el7.x86_64.rpm": {
-                  "type": "-",
-                  "size": 39872,
-                  "lmtime": 1561115765814,
-                  "modified": false
-                },
-                "which-2.20-7.el7.x86_64.rpm": {
-                  "type": "-",
-                  "size": 41716,
-                  "lmtime": 1561115765815,
-                  "modified": false
-                },
-                "zlib-1.2.7-18.el7.x86_64.rpm": {
-                  "type": "-",
-                  "size": 91960,
-                  "lmtime": 1561115765815,
-                  "modified": false
-                },
-                "zlib-devel-1.2.7-18.el7.x86_64.rpm": {
-                  "type": "-",
-                  "size": 51128,
-                  "lmtime": 1561115765816,
-                  "modified": false
-                }
-              },
-              "framework": {
-                "framework-debug-2.0.8-1.el7.centos.x86_64.rpm": {
-                  "type": "-",
-                  "size": 1321048,
-                  "lmtime": 1561115765826,
-                  "modified": false
-                }
-              },
-              "kernel": {
-                "kernel-ml-5.1.8-1.el7.elrepo.x86_64.rpm": {
-                  "type": "-",
-                  "size": 9469952,
-                  "lmtime": 0,
-                  "modified": false
-                }
-              },
-              "rulescan": {}
-            },
-            "tasks": {}
-          },
-          "kni": {
-            "files": {},
-            "tasks": {},
-            "templates": {}
-          },
-          "netcfg-control-blade": {},
-          "tfe": {
-            "files": {},
-            "tasks": {},
-            "templates": {}
-          }
-        },
-        ".vscode": {
-          "ftp-kr.json": {
-            "type": "-",
-            "size": 324,
-            "lmtime": 1561182296827,
-            "modified": false
-          }
-        },
-        "vars": {},
-        "tsg_scripts": {
-          "3rd-packages": {
-            "ansible": {
-              "PyYAML-3.10-11.el7.x86_64.rpm": {
-                "type": "-",
-                "size": 156952,
-                "lmtime": 1561115765594,
-                "modified": false
-              },
-              "ansible-2.4.2.0-2.el7.noarch.rpm": {
-                "type": "-",
-                "size": 7968876,
-                "lmtime": 1561115765649,
-                "modified": false
-              },
-              "libyaml-0.1.4-11.el7_0.x86_64.rpm": {
-                "type": "-",
-                "size": 56068,
-                "lmtime": 1561115765656,
-                "modified": false
-              },
-              "make-3.82-23.el7.x86_64.rpm": {
-                "type": "-",
-                "size": 430540,
-                "lmtime": 1561115765664,
-                "modified": false
-              },
-              "openssl-1.0.2k-16.el7_6.1.x86_64.rpm": {
-                "type": "-",
-                "size": 504632,
-                "lmtime": 1561115765677,
-                "modified": false
-              },
-              "openssl-libs-1.0.2k-16.el7_6.1.x86_64.rpm": {
-                "type": "-",
-                "size": 1251908,
-                "lmtime": 1561115765699,
-                "modified": false
-              },
-              "python-babel-0.9.6-8.el7.noarch.rpm": {
-                "type": "-",
-                "size": 1426348,
-                "lmtime": 1561115765734,
-                "modified": false
-              },
-              "python-backports-1.0-8.el7.x86_64.rpm": {
-                "type": "-",
-                "size": 5932,
-                "lmtime": 1561115765736,
-                "modified": false
-              },
-              "python-backports-ssl_match_hostname-3.5.0.1-1.el7.noarch.rpm": {
-                "type": "-",
-                "size": 12896,
-                "lmtime": 1561115765738,
-                "modified": false
-              },
-              "python-cffi-1.6.0-5.el7.x86_64.rpm": {
-                "type": "-",
-                "size": 223012,
-                "lmtime": 1561115765744,
-                "modified": false
-              },
-              "python-enum34-1.0.4-1.el7.noarch.rpm": {
-                "type": "-",
-                "size": 53496,
-                "lmtime": 1561115765746,
-                "modified": false
-              },
-              "python-httplib2-0.9.2-1.el7.noarch.rpm": {
-                "type": "-",
-                "size": 117968,
-                "lmtime": 1561115765749,
-                "modified": false
-              },
-              "python-idna-2.4-1.el7.noarch.rpm": {
-                "type": "-",
-                "size": 95952,
-                "lmtime": 1561115765754,
-                "modified": false
-              },
-              "python-ipaddress-1.0.16-2.el7.noarch.rpm": {
-                "type": "-",
-                "size": 35176,
-                "lmtime": 1561115765756,
-                "modified": false
-              },
-              "python-jinja2-2.7.2-3.el7_6.noarch.rpm": {
-                "type": "-",
-                "size": 530920,
-                "lmtime": 1561115765763,
-                "modified": false
-              },
-              "python-markupsafe-0.11-10.el7.x86_64.rpm": {
-                "type": "-",
-                "size": 25792,
-                "lmtime": 1561115765765,
-                "modified": false
-              },
-              "python-paramiko-2.1.1-9.el7.noarch.rpm": {
-                "type": "-",
-                "size": 275112,
-                "lmtime": 1561115765770,
-                "modified": false
-              },
-              "python-passlib-1.6.5-2.el7.noarch.rpm": {
-                "type": "-",
-                "size": 500108,
-                "lmtime": 1561115765776,
-                "modified": false
-              },
-              "python-ply-3.4-11.el7.noarch.rpm": {
-                "type": "-",
-                "size": 125732,
-                "lmtime": 1561115765779,
-                "modified": false
-              },
-              "python-pycparser-2.14-1.el7.noarch.rpm": {
-                "type": "-",
-                "size": 106984,
-                "lmtime": 1561115765781,
-                "modified": false
-              },
-              "python-setuptools-0.9.8-7.el7.noarch.rpm": {
-                "type": "-",
-                "size": 406404,
-                "lmtime": 1561115765786,
-                "modified": false
-              },
-              "python-six-1.9.0-2.el7.noarch.rpm": {
-                "type": "-",
-                "size": 29404,
-                "lmtime": 1561115765787,
-                "modified": false
-              },
-              "python2-cryptography-1.7.2-2.el7.x86_64.rpm": {
-                "type": "-",
-                "size": 514504,
-                "lmtime": 1561115765792,
-                "modified": false
-              },
-              "python2-jmespath-0.9.0-3.el7.noarch.rpm": {
-                "type": "-",
-                "size": 39576,
-                "lmtime": 1561115765796,
-                "modified": false
-              },
-              "python2-pyasn1-0.1.9-7.el7.noarch.rpm": {
-                "type": "-",
-                "size": 102132,
-                "lmtime": 1561115765799,
-                "modified": false
-              },
-              "sshpass-1.06-2.el7.x86_64.rpm": {
-                "type": "-",
-                "size": 21896,
-                "lmtime": 1561115765800,
-                "modified": false
-              }
-            },
-            "dkms": {
-              "dkms-2.7.1-1.el7.noarch.rpm": {
-                "type": "-",
-                "size": 76956,
-                "lmtime": 1561115765803,
-                "modified": false
-              },
-              "elfutils-libelf-devel-0.172-2.el7.x86_64.rpm": {
-                "type": "-",
-                "size": 39872,
-                "lmtime": 1561115765804,
-                "modified": false
-              },
-              "which-2.20-7.el7.x86_64.rpm": {
-                "type": "-",
-                "size": 41716,
-                "lmtime": 1561115765805,
-                "modified": false
-              },
-              "zlib-1.2.7-18.el7.x86_64.rpm": {
-                "type": "-",
-                "size": 91960,
-                "lmtime": 1561115765807,
-                "modified": false
-              },
-              "zlib-devel-1.2.7-18.el7.x86_64.rpm": {
-                "type": "-",
-                "size": 51128,
-                "lmtime": 1561115765808,
-                "modified": false
-              }
-            }
-          },
-          "hosts.hyadc": {
-            "type": "-",
-            "size": 87,
-            "lmtime": 1561115765809,
-            "modified": false
-          },
-          "hosts.ycxadc": {
-            "type": "-",
-            "size": 174,
-            "lmtime": 1561115765809,
-            "modified": false
-          },
-          "roles": {
-            "framework": {
-              "files": {
-                "dkms": {
-                  "dkms-2.7.1-1.el7.noarch.rpm": {
-                    "type": "-",
-                    "size": 76956,
-                    "lmtime": 1561115765813,
-                    "modified": false
-                  },
-                  "elfutils-libelf-devel-0.172-2.el7.x86_64.rpm": {
-                    "type": "-",
-                    "size": 39872,
-                    "lmtime": 1561115765814,
-                    "modified": false
-                  },
-                  "which-2.20-7.el7.x86_64.rpm": {
-                    "type": "-",
-                    "size": 41716,
-                    "lmtime": 1561115765815,
-                    "modified": false
-                  },
-                  "zlib-1.2.7-18.el7.x86_64.rpm": {
-                    "type": "-",
-                    "size": 91960,
-                    "lmtime": 1561115765815,
-                    "modified": false
-                  },
-                  "zlib-devel-1.2.7-18.el7.x86_64.rpm": {
-                    "type": "-",
-                    "size": 51128,
-                    "lmtime": 1561115765816,
-                    "modified": false
-                  }
-                },
-                "framework": {
-                  "framework-debug-2.0.8-1.el7.centos.x86_64.rpm": {
-                    "type": "-",
-                    "size": 1321048,
-                    "lmtime": 1561115765826,
-                    "modified": false
-                  }
-                },
-                "kernel": {
-                  "kernel-ml-5.1.8-1.el7.elrepo.x86_64.rpm": {
-                    "type": "-",
-                    "size": 49649456,
-                    "lmtime": 1561115766331,
-                    "modified": false
-                  },
-                  "kernel-ml-devel-5.1.8-1.el7.elrepo.x86_64.rpm": {
-                    "type": "-",
-                    "size": 13079596,
-                    "lmtime": 1561115766442,
-                    "modified": false
-                  }
-                },
-                "maat": {
-                  "include": {
-                    "Maat_command.h": {
-                      "type": "-",
-                      "size": 5987,
-                      "lmtime": 1561115766448,
-                      "modified": false
-                    },
-                    "Maat_rule.h": {
-                      "type": "-",
-                      "size": 13989,
-                      "lmtime": 1561115766448,
-                      "modified": false
-                    },
-                    "gram_index_engine.h": {
-                      "type": "-",
-                      "size": 1632,
-                      "lmtime": 1561115766448,
-                      "modified": false
-                    },
-                    "stream_fuzzy_hash.h": {
-                      "type": "-",
-                      "size": 1906,
-                      "lmtime": 1561115766448,
-                      "modified": false
-                    }
-                  },
-                  "lib": {
-                    "libmaatframe.so": {
-                      "type": "-",
-                      "size": 4579656,
-                      "lmtime": 1561115766501,
-                      "modified": false
-                    },
-                    "libmaatframe.so.2": {
-                      "type": "-",
-                      "size": 4579656,
-                      "lmtime": 1561115766501,
-                      "modified": false
-                    },
-                    "libmaatframe.so.2.7": {
-                      "type": "-",
-                      "size": 4579656,
-                      "lmtime": 1561115766501,
-                      "modified": false
-                    }
-                  }
-                },
-                "mrzcpd-4.3.9.497aaf5-1.el7.x86_64.rpm": {
-                  "type": "-",
-                  "size": 39793496,
-                  "lmtime": 1561115766876,
-                  "modified": false
-                },
-                "rulescan": {
-                  "librulescan.so": {
-                    "type": "-",
-                    "size": 4574184,
-                    "lmtime": 1561115767001,
-                    "modified": false
-                  },
-                  "rulescan.h": {
-                    "type": "-",
-                    "size": 13272,
-                    "lmtime": 1561115767025,
-                    "modified": false
-                  }
-                }
-              },
-              "tasks": {
-                "main.yml": {
-                  "type": "-",
-                  "size": 1602,
-                  "lmtime": 1561115767029,
-                  "modified": false
-                }
-              }
-            },
-            "kni": {
-              "files": {
-                "kni.tar.gz": {
-                  "type": "-",
-                  "size": 1020018,
-                  "lmtime": 1561180439000,
-                  "modified": false
-                }
-              },
-              "tasks": {
-                "main.yml": {
-                  "type": "-",
-                  "size": 364,
-                  "lmtime": 1561187383683,
-                  "modified": false
-                }
-              },
-              "templates": {
-                "kni.conf.j2": {
-                  "type": "-",
-                  "size": 2018,
-                  "lmtime": 1561187099641,
-                  "modified": false
-                }
-              }
-            },
-            "netcfg-control-blade": {
-              "templates": {
-                "tsg-environment.j2": {
-                  "type": "-",
-                  "size": 408,
-                  "lmtime": 1561115767033,
-                  "modified": false
-                },
-                "tsg-netcfg-control-blade.service.j2": {
-                  "type": "-",
-                  "size": 1474,
-                  "lmtime": 1561115767035,
-                  "modified": false
-                }
-              }
-            },
-            "tfe": {
-              "files": {
-                "tfe-debug-4.0.0.1a59abc-1.el7.x86_64.rpm": {
-                  "type": "-",
-                  "size": 3466152,
-                  "lmtime": 1561115767072,
-                  "modified": false
-                }
-              },
-              "tasks": {
-                "main.yml": {
-                  "type": "-",
-                  "size": 589,
-                  "lmtime": 1561115767076,
-                  "modified": false
-                }
-              },
-              "templates": {
-                "pangu_pxy.conf.j2": {
-                  "type": "-",
-                  "size": 3951,
-                  "lmtime": 1561115767077,
-                  "modified": false
-                },
-                "tfe.conf.j2": {
-                  "type": "-",
-                  "size": 1221,
-                  "lmtime": 1561115767078,
-                  "modified": false
-                }
-              }
-            }
-          },
-          "site.yml": {
-            "type": "-",
-            "size": 1301,
-            "lmtime": 1561182351626,
-            "modified": false
-          },
-          "vars": {
-            "common.yml": {
-              "type": "-",
-              "size": 252,
-              "lmtime": 1561115767080,
-              "modified": false
-            },
-            "kni.yml": {
-              "type": "-",
-              "size": 1058,
-              "lmtime": 1561187464820,
-              "modified": false
-            },
-            "tfe.yml": {
-              "type": "-",
-              "size": 88,
-              "lmtime": 1561115767081,
-              "modified": false
-            }
-          }
-        }
-      }
-    }
-  },
-  "$version": 1
-}
\ No newline at end of file
diff --git a/hosts.astana b/hosts.astana
new file mode 100644
index 0000000..f7aae56
--- /dev/null
+++ b/hosts.astana
@@ -0,0 +1,41 @@
+[all:vars]

+ansible_user=root

+

+[blade-00]

+10.4.39.9

+#10.4.39.13

+10.4.39.17

+10.4.39.21

+10.4.39.25

+10.4.39.29

+10.4.39.33

+

+[blade-01]

+10.4.39.10

+#10.4.39.14

+10.4.39.18

+10.4.39.22

+10.4.39.26

+10.4.39.30

+10.4.39.34

+

+[blade-02]

+10.4.39.11

+#10.4.39.15

+10.4.39.19

+10.4.39.23

+10.4.39.27

+10.4.39.31

+10.4.39.35

+

+[blade-03]

+10.4.39.12

+#10.4.39.16

+10.4.39.20

+10.4.39.24

+10.4.39.28

+10.4.39.32

+10.4.39.36

+

+[certstore]

+10.4.35.1 ansible_user=tsg

diff --git a/hosts.hyadc b/hosts.hyadc
deleted file mode 100644
index 3ff4c05..0000000
--- a/hosts.hyadc
+++ /dev/null
@@ -1,8 +0,0 @@
-[all:vars]

-ansible_user=root

-

-[blade-00]

-192.168.10.41

-

-[blade-03]

-192.168.10.42
\ No newline at end of file
diff --git a/hosts.ycxadc b/hosts.ycxadc
deleted file mode 100644
index 4c5d9ea..0000000
--- a/hosts.ycxadc
+++ /dev/null
@@ -1,13 +0,0 @@
-[all:vars]
-ansible_user=root
-
-#[switch-blade]
-#202.43.148.184 ansible_port=51022
-
-[master-blade]
-192.168.10.161
-
-[slave-blade]
-192.168.10.162
-#192.168.10.163
-#192.168.10.164
diff --git a/roles/framework/files/dkms/elfutils-libelf-devel-0.172-2.el7.x86_64.rpm b/roles/framework/files/dkms/elfutils-libelf-devel-0.172-2.el7.x86_64.rpm
deleted file mode 100644
index b269109..0000000
--- a/roles/framework/files/dkms/elfutils-libelf-devel-0.172-2.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/framework/files/dkms/which-2.20-7.el7.x86_64.rpm b/roles/framework/files/dkms/which-2.20-7.el7.x86_64.rpm
deleted file mode 100644
index d97c56e..0000000
--- a/roles/framework/files/dkms/which-2.20-7.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/framework/files/dkms/zlib-1.2.7-18.el7.x86_64.rpm b/roles/framework/files/dkms/zlib-1.2.7-18.el7.x86_64.rpm
deleted file mode 100644
index 02f4c89..0000000
--- a/roles/framework/files/dkms/zlib-1.2.7-18.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/framework/files/dkms/zlib-devel-1.2.7-18.el7.x86_64.rpm b/roles/framework/files/dkms/zlib-devel-1.2.7-18.el7.x86_64.rpm
deleted file mode 100644
index 0dbfa0a..0000000
--- a/roles/framework/files/dkms/zlib-devel-1.2.7-18.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/framework/files/maat/lib/libmaatframe.so.2.7 b/roles/framework/files/maat/lib/libmaatframe.so.2.7
index 9153183..476ae67 100755
--- a/roles/framework/files/maat/lib/libmaatframe.so.2.7
+++ b/roles/framework/files/maat/lib/libmaatframe.so.2.7
diff --git a/roles/framework/files/rulescan/librulescan.so b/roles/framework/files/rulescan/librulescan.so
index a21a251..b953420 100755
--- a/roles/framework/files/rulescan/librulescan.so
+++ b/roles/framework/files/rulescan/librulescan.so
diff --git a/roles/framework/tasks/main.yml b/roles/framework/tasks/main.yml
index 5351499..c5105e4 100644
--- a/roles/framework/tasks/main.yml
+++ b/roles/framework/tasks/main.yml
@@ -4,18 +4,12 @@
     src: "{{ role_path }}/files/"
     dest: "/tmp/ansible_deploy/"
 
-- name: "install kernels and other packages"
+- name: "install framework packages"
   yum:
     name: "{{ packages }}"
     state: present
   vars:
     packages:
-      - /tmp/ansible_deploy/kernel/kernel-ml-5.1.8-1.el7.elrepo.x86_64.rpm
-      - /tmp/ansible_deploy/kernel/kernel-ml-devel-5.1.8-1.el7.elrepo.x86_64.rpm
-      - /tmp/ansible_deploy/dkms/zlib-devel-1.2.7-18.el7.x86_64.rpm
-      - /tmp/ansible_deploy/dkms/elfutils-libelf-devel-0.172-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/dkms/zlib-1.2.7-18.el7.x86_64.rpm
-      - /tmp/ansible_deploy/dkms/which-2.20-7.el7.x86_64.rpm
       - /tmp/ansible_deploy/dkms/dkms-2.7.1-1.el7.noarch.rpm
       - /tmp/ansible_deploy/framework/framework-2.0.9.f583d06-1.el7.centos.x86_64.rpm
 
@@ -39,13 +33,5 @@
     src: "{{ role_path }}/files/maat/lib/"
     dest: /opt/MESA/lib/
 
-- name: "downgrade htable"
-  synchronize:
-    src: "{{ role_path }}/files/htable"
-    dest: /opt/MESA/lib/
-
 - name: "update ld"
   command: ldconfig
-
-- name: "set kernel-ml as default kernel"
-  command: /usr/sbin/grub2-set-default 0
diff --git a/roles/kernel-ml/files/kernel/kernel-ml-5.1.8-1.el7.elrepo.x86_64.rpm b/roles/kernel-ml/files/kernel/kernel-ml-5.1.8-1.el7.elrepo.x86_64.rpm
new file mode 100644
index 0000000..6fefdec
--- /dev/null
+++ b/roles/kernel-ml/files/kernel/kernel-ml-5.1.8-1.el7.elrepo.x86_64.rpm
diff --git a/roles/kernel-ml/files/kernel/kernel-ml-devel-5.1.8-1.el7.elrepo.x86_64.rpm b/roles/kernel-ml/files/kernel/kernel-ml-devel-5.1.8-1.el7.elrepo.x86_64.rpm
new file mode 100644
index 0000000..1dd97ca
--- /dev/null
+++ b/roles/kernel-ml/files/kernel/kernel-ml-devel-5.1.8-1.el7.elrepo.x86_64.rpm
diff --git a/roles/kernel-ml/tasks/main.yml b/roles/kernel-ml/tasks/main.yml
new file mode 100644
index 0000000..cb860df
--- /dev/null
+++ b/roles/kernel-ml/tasks/main.yml
@@ -0,0 +1,19 @@
+---
+- name: "copy framework rpms to destination server"
+  synchronize:
+    src: "{{ role_path }}/files/"
+    dest: "/tmp/ansible_deploy/"
+
+- name: "install kernels-ml"
+  yum:
+    name: "{{ packages }}"
+    state: present
+  vars:
+    packages:
+      - /tmp/ansible_deploy/kernel/kernel-ml-5.1.8-1.el7.elrepo.x86_64.rpm
+      - /tmp/ansible_deploy/kernel/kernel-ml-devel-5.1.8-1.el7.elrepo.x86_64.rpm
+  register: t_kernel_ml
+
+- name: "set kernel-ml as default kernel"
+  command: /usr/sbin/grub2-set-default 0
+  when: t_kernel_ml.changed
diff --git a/roles/kni/files/kni.tar.gz b/roles/kni/files/kni.tar.gz
deleted file mode 100644
index 90e90f5..0000000
--- a/roles/kni/files/kni.tar.gz
+++ /dev/null
diff --git a/roles/kni/files/kni_20190630.tar.gz b/roles/kni/files/kni_20190630.tar.gz
new file mode 100644
index 0000000..6925ec8
--- /dev/null
+++ b/roles/kni/files/kni_20190630.tar.gz
diff --git a/roles/kni/tasks/main.yml b/roles/kni/tasks/main.yml
index ca5b716..3f96574 100644
--- a/roles/kni/tasks/main.yml
+++ b/roles/kni/tasks/main.yml
@@ -5,7 +5,7 @@
   
 - name: Extract kni.tar.gz
   unarchive:
-    src: "{{ role_path }}/files/kni.tar.gz"
+    src: "{{ role_path }}/files/kni_20190630.tar.gz"
     dest: /home/tsg
   tags: extract
 
@@ -15,8 +15,12 @@
     dest: /home/tsg/kni/conf/kni/kni.conf
   tags: template
 
-- name: Template the gdev.conf
-  template:
-    src: "{{ role_path }}/templates/gdev.conf.j2"
-    dest: /home/tsg/kni/conf/gdev.conf
-  tags: template
\ No newline at end of file
+- name: bootup sapp
+  blockinfile:
+    path: /etc/rc.d/rc.local
+    block: |
+        systemctl start mrzcpd
+        systemctl start mrtunnat
+        sleep 15
+        cd /home/tsg/kni; ./r2
+
diff --git a/roles/mrzcpd/templates/mrglobal.conf.inline.j2 b/roles/mrzcpd/templates/mrglobal.conf.inline.j2
index 63a9b7f..17346fb 100644
--- a/roles/mrzcpd/templates/mrglobal.conf.inline.j2
+++ b/roles/mrzcpd/templates/mrglobal.conf.inline.j2
@@ -17,7 +17,7 @@ jumbo_frame=1
 max_rx_pkt_len=15360
 clear_tx_flags=1
 vlan-filter=1
-vlan-id-allow=1
+vlan-id-allow=3811,3812,3821,3822
 vlan-pvid=0
 vlan-pvid-mode=0
 
@@ -73,4 +73,4 @@ forward_rule_5=vp,{{nic_to_tfe.tfe0.name}},{{nic_to_tfe.tfe0.name}}
 forward_rule_6=pv,{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe1.name}}
 forward_rule_7=vp,{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe1.name}}
 forward_rule_8=pv,{{nic_to_tfe.tfe2.name}},{{nic_to_tfe.tfe2.name}}
-forward_rule_9=vp,{{nic_to_tfe.tfe2.name}},{{nic_to_tfe.tfe2.name}}
\ No newline at end of file
+forward_rule_9=vp,{{nic_to_tfe.tfe2.name}},{{nic_to_tfe.tfe2.name}}
diff --git a/roles/mrzcpd/templates/mrtunnat.conf.inline.j2 b/roles/mrzcpd/templates/mrtunnat.conf.inline.j2
index 0b9dd61..8809344 100644
--- a/roles/mrzcpd/templates/mrtunnat.conf.inline.j2
+++ b/roles/mrzcpd/templates/mrtunnat.conf.inline.j2
@@ -2,4 +2,15 @@
 lcore_id=49,50,51,52

 appsym=tunnat

 phydev={{nic_data_incoming.name}}

-virtdev=vxlan_fwd
\ No newline at end of file
+virtdev=vxlan_fwd

+nr_max_sessions=131070

+expire_time=180

+reverse_tunnel=0

+use_recent_tunnel=0

+

+[vlan_flipping]

+enable=1

+c_router_vlan_id_0=3811

+i_router_vlan_id_0=3812

+c_router_vlan_id_1=3821

+i_router_vlan_id_1=3822

diff --git a/roles/tfe/files/tfe-4.0.1.c7ecf01-1.el7.x86_64.rpm b/roles/tfe/files/tfe-4.0.1.c7ecf01-1.el7.x86_64.rpm
deleted file mode 100644
index 1ef7212..0000000
--- a/roles/tfe/files/tfe-4.0.1.c7ecf01-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/tfe/files/tfe-4.0.5.348afbc-1.el7.x86_64.rpm b/roles/tfe/files/tfe-4.0.5.348afbc-1.el7.x86_64.rpm
new file mode 100644
index 0000000..b3c2b3c
--- /dev/null
+++ b/roles/tfe/files/tfe-4.0.5.348afbc-1.el7.x86_64.rpm
diff --git a/roles/tfe/tasks/main.yml b/roles/tfe/tasks/main.yml
index dcd27b1..9ec1be9 100644
--- a/roles/tfe/tasks/main.yml
+++ b/roles/tfe/tasks/main.yml
@@ -10,7 +10,7 @@
     state: present
   vars:
     packages:
-      - /tmp/ansible_deploy/tfe-4.0.1.c7ecf01-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tfe-4.0.5.348afbc-1.el7.x86_64.rpm
       - /tmp/ansible_deploy/tfe-kmod-6ed8c79-1dkms.noarch.rpm
 
 - name: "template tfe-env config"
@@ -28,7 +28,7 @@
     src: "{{ role_path }}/templates/pangu_pxy.conf.j2"
     dest: /home/tsg/tfe/conf/pangu/pangu_pxy.conf
 
-- name: "add tfe-kmod to boot"
+- name: "start tfe-kmod"
   modprobe:
     name: tfe_kmod
     state: present
@@ -36,6 +36,18 @@
 - name: "enable tfe-env"
   systemd:
     name: tfe-env
-    enabled: no
+    enabled: yes
     daemon_reload: yes
-    state: restarted
\ No newline at end of file
+    state: restarted
+
+- name: "add tfe-kmod to boot"
+  template:
+    src: "{{ role_path }}/templates/tfe_kmod.conf.j2"
+    dest: /etc/modules-load.d/tfe_kmod.conf
+
+- name: "bootup tfe"
+  blockinfile:
+    path: /etc/rc.d/rc.local
+    block: |
+        systemctl start tfe-env
+        cd /home/tsg/tfe; ./r2_tfe
diff --git a/roles/tfe/templates/tfe.conf.j2 b/roles/tfe/templates/tfe.conf.j2
index 28bd57a..e4bd78a 100644
--- a/roles/tfe/templates/tfe.conf.j2
+++ b/roles/tfe/templates/tfe.conf.j2
@@ -49,7 +49,7 @@ so_keepalive=1
 tcp_keepcnt=8
 tcp_keepintvl=15
 tcp_keepidle=30
-tcp_user_timeout=30
+tcp_user_timeout=600
 tcp_ttl_upstream=75
 tcp_ttl_downstream=70
 
@@ -61,4 +61,4 @@ statsd_server=192.168.10.72
 statsd_port=8126
 
 [http]
-loglevel=20
\ No newline at end of file
+loglevel=20
diff --git a/roles/tfe/templates/tfe_kmod.conf.j2 b/roles/tfe/templates/tfe_kmod.conf.j2
new file mode 100644
index 0000000..50f1517
--- /dev/null
+++ b/roles/tfe/templates/tfe_kmod.conf.j2
@@ -0,0 +1,2 @@
+# load tfe_kmod at boot
+tfe_kmod
diff --git a/site.framework.only.yml b/site.framework.only.yml
new file mode 100644
index 0000000..839606c
--- /dev/null
+++ b/site.framework.only.yml
@@ -0,0 +1,10 @@
+- hosts: blade-*
+  roles:
+    - kernel-ml
+    - framework
+
+- hosts: certstore
+  roles:
+    - framework
+  become: yes
+  become_user: root
diff --git a/site.yml b/site.yml
index b0de74d..fc0e42a 100644
--- a/site.yml
+++ b/site.yml
@@ -1,5 +1,6 @@
 - hosts: blade-00
   roles:
+    - kernel-ml
     - framework
     - mrzcpd
     - kni
@@ -11,9 +12,6 @@
       name: enp7s0
   - nic_data_incoming:
       name: ens1f4
-      ip: 192.168.17.1
-      mask: 255.255.255.0
-      gw: 192.168.17.254
   - nic_inner_ctrl:
       name: ens1.100
   - nic_to_tfe:
@@ -24,8 +22,9 @@
       tfe2: 
         name: ens1f7
 
-- hosts: blade-03
+- hosts: blade-01
   roles:
+    - kernel-ml
     - framework
     - mrzcpd
     - tfe
@@ -41,40 +40,28 @@
   - nic_traffic_mirror:
       name: ens1f2
       use_mrzcpd: 1
-      
-# - hosts: blade-00
-#   - roles:
-#     - framework
-#     - sapp
-#     - kni
 
-# - hosts: blade-01
-#   - roles:
-#     - framework
-#     - tfe-kmod
-#     - tfe
-#   - vars:
-#     nic_mgr:
-#       - name: eth0
-#     nic_data_incoming:
-#       - name: eth3
-#       - address: 172.16.254.1
-#       - mac: AA:BB:CC:DD:EE:FF
-#       - peer: 172.16.254.254
-#     nic_traffic_mirror:
-#       - name: eth4
+- hosts: blade-02 blade-03
+  roles:
+    - kernel-ml
+    - framework
+    - mrzcpd
+    - tfe
+  vars_files:
+    - "vars/common.yml"
+    - "vars/tfe.yml"
+  vars:
+  - nic_mgr:
+      name: enp7s0
+  - nic_data_incoming:
+      name: ens8f1
+      mac: AA:BB:CC:DD:EE:FF
+  - nic_traffic_mirror:
+      name: ens8f2
+      use_mrzcpd: 1
 
-# - hosts: blade-02
-#     - net-ctrlblade
-#     - tfe-kmod
-#     - tfe
-#   nic_mgr:
-#     - name: eth0
-#     nic_data_incoming:
-#       name: eth3
-#       inet_addr: 172.16.254.2
-#       inet6_addr: fd00::1
-#       gw_inet_addr: 172.16.254.254
-#       gw_ether_addr: BB:CC:DD:EE:FF:AA
-#     nic_traffic_mirror:
-#       name: eth4
\ No newline at end of file
+- hosts: certstore
+  roles:
+    - framework
+  become: yes
+  become_user: root
diff --git a/vars/common.yml b/vars/common.yml
index 11862e3..d683254 100644
--- a/vars/common.yml
+++ b/vars/common.yml
@@ -1,12 +1,12 @@
 - maat_redis_server:

-    address: 192.168.11.243

+    address: 10.4.35.1

     port: 6379

-    db: 4

+    db: 0

 - cert_store_server:

-    address: 192.168.10.8

+    address: 10.4.35.1

     port: 9991

 - log_kafkabrokers:

-    address: "0.0.0.0:9092"

+    address: "10.4.37.7:9092,10.4.35.8:9092,10.4.35.9:9092"

 - log_minio:

-    address: "10.4.35.42-46;"

-    port: 9000
\ No newline at end of file
+    address: "10.4.35.1;"

+    port: 9000