Merge branch 'dev' of http://192.168.1.220:10080/EHR/ehr.config into dev

svr-pack-analyze.yml

@@ -60,8 +60,8 @@ fast-dfs:
hadoop:
  hbase-properties:
    - hbase.zookeeper.property.clientPort: 2181
    - zookeeper.znode.parent: /hbase-unsecure
    hbase.zookeeper.property.clientPort: 2181
    zookeeper.znode.parent: /hbase-unsecure
  user:
    name: root
@@ -98,7 +98,7 @@ elasticsearch:
  cluster-nodes: 172.17.110.87:9300
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
@@ -126,7 +126,7 @@ elasticsearch:
  cluster-nodes: 172.17.110.17:9300
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
@@ -153,7 +153,7 @@ elasticsearch:
  cluster-nodes: 172.17.110.17:9300
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
@@ -183,7 +183,7 @@ elasticsearch:
hadoop:
  hbase-properties:
    #- hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
    - hbase.zookeeper.quorum: node1,node2,node3
    hbase.zookeeper.quorum: node1,node2,node3
---
spring:
@@ -212,7 +212,7 @@ elasticsearch:
  cluster-nodes: 172.17.110.17:9300
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com
    hbase.zookeeper.quorum: node1.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com
---
spring:
@@ -244,4 +244,4 @@ elasticsearch:
hadoop:
  hbase-properties:
    #- hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
    - hbase.zookeeper.quorum: node1,node2,node3
    hbase.zookeeper.quorum: node1,node2,node3

svr-pack-resolve.yml

@@ -56,8 +56,8 @@ fast-dfs:
hadoop:
  hbase-properties:
    - hbase.zookeeper.property.clientPort: 2181
    - zookeeper.znode.parent: /hbase-unsecure
    hbase.zookeeper.property.clientPort: 2181
    zookeeper.znode.parent: /hbase-unsecure
  user:
    name: root
@@ -166,7 +166,7 @@ fast-dfs:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
@@ -193,7 +193,7 @@ fast-dfs:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
@@ -221,7 +221,7 @@ fast-dfs:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
@@ -250,7 +250,7 @@ fast-dfs:
hadoop:
  hbase-properties:
    #- hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
    - hbase.zookeeper.quorum: node1,node2,node3
    hbase.zookeeper.quorum: node1,node2,node3
---
@@ -279,7 +279,7 @@ fast-dfs:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com
    hbase.zookeeper.quorum: node1.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com
---
@@ -308,7 +308,7 @@ fast-dfs:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com
    hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com
---
spring:
@@ -336,4 +336,4 @@ fast-dfs:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com,node4.hde.h3c.com
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com,node4.hde.h3c.com

svr-resource.yml

@@ -9,8 +9,8 @@ logging:
hadoop:
  hbase-properties:
    - hbase.zookeeper.property.clientPort: 2181
    - zookeeper.znode.parent: /hbase-unsecure
    hbase.zookeeper.property.clientPort: 2181
    zookeeper.znode.parent: /hbase-unsecure
  user:
    name: root
@@ -39,7 +39,7 @@ spring:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
fast-dfs:
  tracker-server: 172.19.103.13:22122
@@ -61,7 +61,7 @@ spring:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
eip:
  tenant: jkzl
@@ -81,7 +81,7 @@ spring:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
fast-dfs:
  tracker-server: 172.19.103.13:22122
@@ -104,7 +104,7 @@ spring:
      zk-host: node1.hde.jkzlehr.com,node2.hde.jkzlehr.com,node3.hde.jkzlehr.com:2181/solr
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
    hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
fast-dfs:
  tracker-server: 172.19.103.13:22122
@@ -129,7 +129,7 @@ spring:
      zk-host: node1.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com:2181/solr
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com
    hbase.zookeeper.quorum: node1.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com
fast-dfs:
  tracker-server: 11.1.2.9:22122
@@ -154,7 +154,7 @@ spring:
      zk-host: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com:2181/solr
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com
    hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com
fast-dfs:
  tracker-server: 10.176.97.5:22122
@@ -180,7 +180,7 @@ spring:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com,node4.hde.h3c.com:2181/solr
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com,node4.hde.h3c.com
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com,node4.hde.h3c.com
fast-dfs:
  tracker-server: 100.100.1.157:22122