Merge branch '10543' into 'master'

Fixes ZSTAC-10543

Closes ZSTAC-10543

See merge request zstackio/zstack!2417

Author: gitlab

plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java

@@ -2488,16 +2488,19 @@ private boolean noStorageAccessible(){
     private void createHostVersionSystemTags(String distro, String release, String version) {
         SystemTagCreator creator = HostSystemTags.OS_DISTRIBUTION.newSystemTagCreator(self.getUuid());
         creator.inherent = true;
+        creator.recreate = true;
         creator.setTagByTokens(map(e(HostSystemTags.OS_DISTRIBUTION_TOKEN, distro)));
         creator.create();
 
         creator = HostSystemTags.OS_RELEASE.newSystemTagCreator(self.getUuid());
         creator.inherent = true;
+        creator.recreate = true;
         creator.setTagByTokens(map(e(HostSystemTags.OS_RELEASE_TOKEN, release)));
         creator.create();
 
         creator = HostSystemTags.OS_VERSION.newSystemTagCreator(self.getUuid());
         creator.inherent = true;
+        creator.recreate = true;
         creator.setTagByTokens(map(e(HostSystemTags.OS_VERSION_TOKEN, version)));
         creator.create();
     }
@@ -2967,6 +2970,40 @@ public void fail(ErrorCode errorCode) {
                     }
                 });
 
+                flow(new NoRollbackFlow() {
+                    String __name__ = "ansbile-update-kvm-host-facts";
+
+                    @Override
+                    public void run(FlowTrigger trigger, Map data) {
+                        String privKeyFile = PathUtil.findFileOnClassPath(AnsibleConstant.RSA_PRIVATE_KEY).getAbsolutePath();
+                        ShellResult ret = ShellUtils.runAndReturn(String.format("ansible -i %s --private-key %s -m setup -a filter=ansible_distribution* %s -e 'ansible_ssh_port=%d ansible_ssh_user=%s'",
+                                AnsibleConstant.INVENTORY_FILE, privKeyFile, self.getManagementIp(), getSelf().getPort(), getSelf().getUsername()), AnsibleConstant.ROOT_DIR);
+                        if (!ret.isReturnCode(0)) {
+                            trigger.fail(operr("unable to get kvm host[uuid:%s, ip:%s] facts by ansible\n%s", self.getUuid(), self.getManagementIp(), ret.getExecutionLog()));
+                            return;
+                        }
+
+                        String[] pairs = ret.getStdout().split(">>");
+                        if (pairs.length != 2) {
+                            trigger.fail(operr("unrecognized ansible facts mediaType, %s", ret.getStdout()));
+                            return;
+                        }
+
+                        LinkedHashMap output = JSONObjectUtil.toObject(pairs[1], LinkedHashMap.class);
+                        LinkedHashMap facts = (LinkedHashMap) output.get("ansible_facts");
+                        if (facts == null) {
+                            trigger.fail(operr("unrecognized ansible facts mediaType, cannot find field 'ansible_facts', %s", ret.getStdout()));
+                            return;
+                        }
+
+                        String distro = (String) facts.get("ansible_distribution");
+                        String release = (String) facts.get("ansible_distribution_release");
+                        String version = (String) facts.get("ansible_distribution_version");
+                        createHostVersionSystemTags(distro, release, version);
+                        trigger.next();
+                    }
+                });
+
                 flow(new NoRollbackFlow() {
                     String __name__ = "recover-host-state";