diff options
| author |   dengyh <dengyuanhong @chinamobile.com> | 2020-07-24 10:28:00 +0800 |
|---|---|---|
| committer |   Yuanhong Deng <dengyuanhong@chinamobile.com> | 2020-07-28 02:26:03 +0000 |
| commit | 7a0c2aa47bc5297a7977e7b7d1a362768efa1e17 (patch) | |
| tree | b964611c4f6b2365b75f94cfba19f01f2d02247e /catalog/pub/config/config.py | |
| parent | 18e83bdb36453f4fe09bc0395597125302ad47f7 (diff) | |
Cancel modifying the config file in the docker entrypoint
script with sed
Issue-ID: MODELING-391
Change-Id: Ia40e85d03cdb29660536576576453cbfc135eaf2
Signed-off-by: dengyh <dengyuanhong @chinamobile.com>
Diffstat (limited to 'catalog/pub/config/config.py')
| -rw-r--r-- | catalog/pub/config/config.py | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/catalog/pub/config/config.py b/catalog/pub/config/config.py index c1d4695..2c42c7a 100644 --- a/catalog/pub/config/config.py +++ b/catalog/pub/config/config.py @@ -12,15 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. +import os +env_dict = os.environ + # [MSB] -MSB_SERVICE_PROTOCOL = 'http' -MSB_SERVICE_IP = '127.0.0.1' -MSB_SERVICE_PORT = '80' +MSB_SERVICE_PROTOCOL = env_dict.get("MSB_PROTO", "http") +MSB_SERVICE_IP = env_dict.get("MSB_ADDR", "127.0.0.1:80").split(':')[0] +MSB_SERVICE_PORT = env_dict.get("MSB_ADDR", "127.0.0.1:80").split(':')[1] MSB_BASE_URL = "%s://%s:%s" % (MSB_SERVICE_PROTOCOL, MSB_SERVICE_IP, MSB_SERVICE_PORT) # [mysql] -DB_IP = "127.0.0.1" -DB_PORT = 3306 +DB_IP = env_dict.get("MYSQL_ADDR", "127.0.0.1:3306").split(':')[0] +DB_PORT = env_dict.get("MYSQL_ADDR", "127.0.0.1:3306").split(':')[1] DB_NAME = "etsicatalog" DB_USER = "etsicatalog" DB_PASSWD = "etsicatalog" @@ -32,12 +35,13 @@ FORWARDED_FOR_FIELDS = ["HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED_HOST", # [register] REG_TO_MSB_WHEN_START = True -SSL_ENABLED = "true" REG_TO_MSB_REG_URL = "/api/microservices/v1/services" +SSL_ENABLED = env_dict.get("SSL_ENABLED", "true") if SSL_ENABLED == "true": enable_ssl = "true" else: enable_ssl = "false" +svc_ip = env_dict.get("SERVICE_IP", "127.0.0.1") REG_TO_MSB_REG_PARAM = [{ "serviceName": "catalog", "version": "v1", @@ -46,7 +50,7 @@ REG_TO_MSB_REG_PARAM = [{ "protocol": "REST", "visualRange": "1", "nodes": [{ - "ip": "127.0.0.1", + "ip": svc_ip, "port": "8806", "ttl": 0 }] @@ -58,7 +62,7 @@ REG_TO_MSB_REG_PARAM = [{ "protocol": "REST", "visualRange": "1", "nodes": [{ - "ip": "127.0.0.1", + "ip": svc_ip, "port": "8806", "ttl": 0 }] @@ -70,7 +74,7 @@ REG_TO_MSB_REG_PARAM = [{ "protocol": "REST", "visualRange": "1", "nodes": [{ - "ip": "127.0.0.1", + "ip": svc_ip, "port": "8806", "ttl": 0 }] @@ -82,7 +86,7 @@ REG_TO_MSB_REG_PARAM = [{ "protocol": "REST", "visualRange": "1", "nodes": [{ - "ip": "127.0.0.1", + "ip": svc_ip, "port": "8806", "ttl": 0 }] |