curveadm: change project layout and rename some variables.

summerflowers · Dec 28, 2021 · a193b2d · a193b2d
1 parent 81ef9ff
commit a193b2d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/curvefs/conf/client.conf b/curvefs/conf/client.conf
@@ -142,10 +142,10 @@ diskCache.maxUsableSpaceBytes=107374182400
 # the max time system command can run
 diskCache.cmdTimeoutSec=300
 # directory of disk cache
-diskCache.cacheDir=/mnt/curvefs_cache  # __ANSIBLE_TEMPLATE__ /mnt/curvefs_disk_cache/{{ 99999999 | random | to_uuid | upper }} __ANSIBLE_TEMPLATE__  __CURVEADM_TEMPLATE__ /usr/local/curvefs/client/data/cache __CURVEADM_TEMPLATE__
+diskCache.cacheDir=/mnt/curvefs_cache  # __CURVEADM_TEMPLATE__ /curvefs/client/data/cache __CURVEADM_TEMPLATE__  __ANSIBLE_TEMPLATE__ /mnt/curvefs_disk_cache/{{ 99999999 | random | to_uuid | upper }} __ANSIBLE_TEMPLATE__
 
 #### common
-client.common.logDir=/data/logs/curvefs  # __CURVEADM_TEMPLATE__ /usr/local/curvefs/client/logs __CURVEADM_TEMPLATE__
+client.common.logDir=/data/logs/curvefs  # __CURVEADM_TEMPLATE__ /curvefs/client/logs __CURVEADM_TEMPLATE__
 # we have loglevel: {0,3,6,9}
 # as the number increases, it becomes more and more detailed
 client.loglevel=0

diff --git a/curvefs/conf/etcd.conf b/curvefs/conf/etcd.conf
@@ -1,7 +1,7 @@
 # This is the configuration file for the etcd server.
 
 # Human-readable name for this member.
-name:  # __CURVEADM_TEMPLATE__ etcd${service_sequence} __CURVEADM_TEMPLATE__  __ANSIBLE_TEMPLATE__ {{ inventory_hostname }} __ANSIBLE_TEMPLATE__
+name:  # __CURVEADM_TEMPLATE__ etcd${service_host_sequence}${service_replica_sequence} __CURVEADM_TEMPLATE__  __ANSIBLE_TEMPLATE__ {{ inventory_hostname }} __ANSIBLE_TEMPLATE__
 
 # Path to the data directory.
 data-dir:  # __CURVEADM_TEMPLATE__ ${prefix}/data __CURVEADM_TEMPLATE__  __ANSIBLE_TEMPLATE__ {{ curvefs_etcd_data_dir }} __ANSIBLE_TEMPLATE__

diff --git a/curvefs/conf/tools.conf b/curvefs/conf/tools.conf
@@ -5,7 +5,7 @@ mdsDummyAddr=127.0.0.1:7700  # __CURVEADM_TEMPLATE__ ${cluster_mds_dummy_addr} _
 rpcTimeoutMs=500
 rpcRetryTimes=5
 # topo file path
-topoFilePath=curvefs/test/tools/topo_example.json  # __CURVEADM_TEMPLATE__ /usr/local/curvefs/tools/conf/topology.json __CURVEADM_TEMPLATE__  __ANSIBLE_TEMPLATE__ {{ project_root_dest }}/conf/topology.json __ANSIBLE_TEMPLATE__
+topoFilePath=curvefs/test/tools/topo_example.json  # __CURVEADM_TEMPLATE__ /curvefs/tools/conf/topology.json __CURVEADM_TEMPLATE__  __ANSIBLE_TEMPLATE__ {{ project_root_dest }}/conf/topology.json __ANSIBLE_TEMPLATE__
 # metaserver
 metaserverAddr=127.0.0.1:6701  # __CURVEADM_TEMPLATE__ ${cluster_metaserver_addr} __CURVEADM_TEMPLATE__  __ANSIBLE_TEMPLATE__ {{ groups.metaserver | join_peer(hostvars, "metaserver_listen_port") }} __ANSIBLE_TEMPLATE__
 # etcd

diff --git a/curvefs/docker/Dockerfile b/curvefs/docker/Dockerfile
@@ -1,7 +1,7 @@
 FROM opencurvedocker/curve-base:debian9
 ENV TZ=Asia/Shanghai
-RUN mkdir -p /usr/local/curvefs /etc/curvefs /core
-COPY curvefs /usr/local/curvefs
+RUN mkdir -p /curvefs /etc/curvefs /core
+COPY curvefs /curvefs
 COPY entrypoint.sh /
 COPY curvefs/tools/sbin/curvefs_tool /usr/bin
 RUN chmod a+x /entrypoint.sh

diff --git a/curvefs/docker/entrypoint.sh b/curvefs/docker/entrypoint.sh
@@ -67,7 +67,7 @@ function get_options() {
 }
 
 function prepare() {
-    g_prefix="/usr/local/curvefs/$g_role"
+    g_prefix="/curvefs/$g_role"
     conf_path="$g_prefix/conf/$g_role.conf"
 
     case $g_role in