diff --git a/Aries/Aries/settings.py b/Aries/Aries/settings.py index c200746..5d30089 100644 --- a/Aries/Aries/settings.py +++ b/Aries/Aries/settings.py @@ -259,8 +259,6 @@ AUTH_LDAP_USER_ATTR_MAP = AUTH_LDAP_SETTINGS["USER_ATTR_MAP"] REST_BASE_URI = SETTINGS["REST_BASE_URI"] -SHARE_PROXY_BASE_URI = SETTINGS["SHARE_PROXY_BASE_URI"] - AMBARI_SETTINGS = SETTINGS["AMBARI"] AMBARI_URL = AMBARI_SETTINGS["AMBARI_URL"] HDFS_URL = AMBARI_SETTINGS["HDFS_URL"] diff --git a/Aries/hdfs/service.py b/Aries/hdfs/service.py index b30ba8d..2085708 100644 --- a/Aries/hdfs/service.py +++ b/Aries/hdfs/service.py @@ -73,7 +73,7 @@ def postshare(request,path): path = os.path.realpath("/%s/%s" %(os.path.sep,path)) space_name = request.GET.get("spaceName","") proxy_link = hashlib.md5("%s%s%s" %(space_name,path,int(time.time()))).hexdigest() - proxy_link = "{0}/{1}/{2}".format(settings.SHARE_PROXY_BASE_URI,"CloudService/HDFS/ShowShare",proxy_link) + proxy_link = "{0}/{1}/{2}".format(settings.REST_BASE_URI,"CloudService/HDFS/ShowShare",proxy_link) hdfs_logger.info("proxy_link:{0}".format(proxy_link)) # 设置目录权限 chmod -R 755 space_path/path exitCode,data = share_cmd(space_name,path,"755") diff --git a/docker-k8s/k8s_config/sirius-rc-hlg.yaml b/docker-k8s/k8s_config/sirius-rc-hlg.yaml index b5fe22e..2f6e057 100644 --- a/docker-k8s/k8s_config/sirius-rc-hlg.yaml +++ b/docker-k8s/k8s_config/sirius-rc-hlg.yaml @@ -16,8 +16,6 @@ spec: ports: - containerPort: 10086 env: - - name: SHARE_PROXY_BASE_URI - value: "http://172.24.3.150:10086" - name: REST_BASE_URI value: "172.24.3.150:10086" - name: DATABASES_DEFAULT_ENGINE @@ -52,7 +50,7 @@ spec: value: "True" - name: LDAP_CACHE_GROUPS value: "True" - - name: LDAP_GROUP_CACHE_TIMEOUT + - name: LDAP_GROUP_CACHE_TIMEOUT value: "3600" - name: LDAP_USER_ATTR_MAP_USERNAME value: "givenName" diff --git a/docker-k8s/k8s_config/sirius-rc-lugu.yaml b/docker-k8s/k8s_config/sirius-rc-lugu.yaml index 7df1f0d..4613190 100644 --- a/docker-k8s/k8s_config/sirius-rc-lugu.yaml +++ b/docker-k8s/k8s_config/sirius-rc-lugu.yaml @@ -17,8 +17,6 @@ spec: ports: - containerPort: 10086 env: - - name: SHARE_PROXY_BASE_URI - value: "sirius.k8s.baifendian.com" - name: REST_BASE_URI value: "sirius.k8s.baifendian.com" - name: DATABASES_DEFAULT_ENGINE diff --git a/docker-k8s/k8s_config/sirius-rc.yaml b/docker-k8s/k8s_config/sirius-rc.yaml index b5fe22e..2f6e057 100644 --- a/docker-k8s/k8s_config/sirius-rc.yaml +++ b/docker-k8s/k8s_config/sirius-rc.yaml @@ -16,8 +16,6 @@ spec: ports: - containerPort: 10086 env: - - name: SHARE_PROXY_BASE_URI - value: "http://172.24.3.150:10086" - name: REST_BASE_URI value: "172.24.3.150:10086" - name: DATABASES_DEFAULT_ENGINE @@ -52,7 +50,7 @@ spec: value: "True" - name: LDAP_CACHE_GROUPS value: "True" - - name: LDAP_GROUP_CACHE_TIMEOUT + - name: LDAP_GROUP_CACHE_TIMEOUT value: "3600" - name: LDAP_USER_ATTR_MAP_USERNAME value: "givenName" diff --git a/docker-k8s/script/start_script.sh b/docker-k8s/script/start_script.sh index 6dc6088..694f59e 100644 --- a/docker-k8s/script/start_script.sh +++ b/docker-k8s/script/start_script.sh @@ -1,5 +1,4 @@ #!/bin/bash -sed -i "s#k8s_SHARE_PROXY_BASE_URI#$SHARE_PROXY_BASE_URI#g" /opt/Sirius/sbin/Aries.yaml sed -i "s#k8s_REST_BASE_URI#$REST_BASE_URI#g" /opt/Sirius/sbin/Aries.yaml diff --git a/sbin/Aries.yaml b/sbin/Aries.yaml index 76114fb..9ac4601 100644 --- a/sbin/Aries.yaml +++ b/sbin/Aries.yaml @@ -1,4 +1,3 @@ -SHARE_PROXY_BASE_URI: "http://172.24.3.64:10086" REST_BASE_URI: "172.24.3.64:10012" DATABASES: @@ -23,7 +22,7 @@ AUTH_LDAP: BIND_AS_AUTHENTICATING_USER: True CACHE_GROUPS: True GROUP_CACHE_TIMEOUT: 3600 - USER_ATTR_MAP: + USER_ATTR_MAP: username: "givenName" password: "password" @@ -51,7 +50,7 @@ BDMS: WEBHDFS: HOSTS: - - 172.24.3.65:50070 + - 172.24.3.65:50070 - 172.24.3.66:50070 PORT: 50070 PATH: "/webhdfs/v1" @@ -66,7 +65,7 @@ CLIENTHDFS: CODIS: CODIS_REST_URL: 'http://192.168.49.127:8888' OPENTSDB_URL: 'http://192.168.40.140:9999' - + OPENSTACK: IP_KEYSTONE: "192.168.190.11" PORT_KEYSTONE: 5000 diff --git a/sbin/Aries.yaml.k8s b/sbin/Aries.yaml.k8s index 05bd5c9..812dc6b 100644 --- a/sbin/Aries.yaml.k8s +++ b/sbin/Aries.yaml.k8s @@ -1,4 +1,3 @@ -SHARE_PROXY_BASE_URI: k8s_SHARE_PROXY_BASE_URI REST_BASE_URI: k8s_REST_BASE_URI DATABASES: @@ -19,11 +18,11 @@ DATABASES: AUTH_LDAP: SERVER_URI: k8s_LDAP_SERVER_URI - USER_DN_TEMPLATE: k8s_LDAP_DN + USER_DN_TEMPLATE: k8s_LDAP_DN BIND_AS_AUTHENTICATING_USER: k8s_LDAP_BIND CACHE_GROUPS: k8s_LDAP_CACHE_GROUPS GROUP_CACHE_TIMEOUT: k8s_LDAP_GROUP_CACHE_TIMEOUT - USER_ATTR_MAP: + USER_ATTR_MAP: username: k8s_LDAP_USER_ATTR_MAP_USERNAME password: k8s_LDAP_USER_ATTR_MAP_PASSWORD @@ -32,7 +31,7 @@ AMBARI: HDFS_URL: k8s_AMBARI_HDFS_URL HADOOP_CLIENT: k8s_AMBARI_HADOOP_CLIENT AMBARI_PASSWORD: k8s_AMBARI_PASSWORD - AMBARI_USER: k8s_AMBARI_USER + AMBARI_USER: k8s_AMBARI_USER K8S: @@ -43,7 +42,7 @@ K8S: INFLUXDB_DATABASE: k8s_K8S_INFLUXDB_DATABASE BDMS: - IP: k8s_BDMS_IP + IP: k8s_BDMS_IP PORT: k8s_BDMS_PORT USERNAME: k8s_BDMS_USERNAME PASSWORD: k8s_BDMS_PASSWORD @@ -63,7 +62,7 @@ CLIENTHDFS: CODIS: CODIS_REST_URL: k8s_CODIS_REST_URL OPENTSDB_URL: k8s_CODIS_OPENTSDB_URL - + OPENSTACK: IP_KEYSTONE: k8s_OPENSTACK_IP_KEYSTONE PORT_KEYSTONE: k8s_OPENSTACK_PORT_KEYSTONE