Make up for Staging CB-TB v0.9.21

assets/cloudspec.csv

@@ -564,24 +564,12 @@ IBM,jp-osa,bx2-2x8,0.096,34.18,,,,,,,,,,default,default,,,,,,vm
 IBM,jp-tok,bx2-2x8,0.096,34.18,,,,,,,,,,default,default,,,,,,vm
 IBM,us-east,bx2-2x8,0.096,34.18,,,,,,,,,,default,default,,,,,,vm
 IBM,us-south,bx2-2x8,0.096,34.18,,,,,,,,,,default,default,,,,,,vm
-TENCENT,ap-bangkok,S2.MEDIUM4,0.09,59.98,,,,,,,,,,default,default,,,,,,vm
-TENCENT,ap-beijing,SA2.MEDIUM4,0.04,59.98,,,,,,,,,,default,default,,,,,,vm
-TENCENT,ap-chengdu,SA2.MEDIUM4,0.04,59.98,,,,,,,,,,default,default,,,,,,vm
-TENCENT,ap-chongqing,SA2.MEDIUM4,0.04,59.98,,,,,,,,,,default,default,,,,,,vm
-TENCENT,ap-guangzhou,SA2.MEDIUM4,0.04,59.98,,,,,,,,,,default,default,,,,,,vm
-TENCENT,ap-hongkong,SA2.MEDIUM4,0.04,59.98,,,,,,,,,,default,default,,,,,,vm
-TENCENT,ap-jakarta,S5.MEDIUM4,0.03,59.98,,,,,,,,,,default,default,,,,,,vm
-TENCENT,ap-mumbai,S5.MEDIUM4,0.03,59.98,,,,,,,,,,default,default,,,,,,vm
-TENCENT,ap-nanjing,SA2.MEDIUM4,0.04,59.98,,,,,,,,,,default,default,,,,,,vm
-TENCENT,ap-seoul,S2.MEDIUM4,0.09,59.98,,,,,,,,,,default,default,,,,,,vm|k8s
-TENCENT,ap-shanghai,SA2.MEDIUM4,0.04,59.98,,,,,,,,,,default,default,,,,,,vm
-TENCENT,ap-singapore,SA2.MEDIUM4,0.04,59.98,,,,,,,,,,default,default,,,,,,vm
-TENCENT,ap-tokyo,S5.MEDIUM4,0.03,59.98,,,,,,,,,,default,default,,,,,,vm
-TENCENT,eu-frankfurt,SA2.MEDIUM4,0.04,59.98,,,,,,,,,,default,default,,,,,,vm
-TENCENT,eu-moscow,S2.MEDIUM4,0.06,59.98,,,,,,,,,,default,default,,,,,,vm
-TENCENT,na-ashburn,S2.MEDIUM4,0.09,59.98,,,,,,,,,,default,default,,,,,,vm
-TENCENT,na-siliconvalley,SA2.MEDIUM4,0.04,59.98,,,,,,,,,,default,default,,,,,,vm
-TENCENT,na-toronto,S2.MEDIUM4,0.09,59.98,,,,,,,,,,default,default,,,,,,vm
+TENCENT,all,S3.SMALL2,0.04,59.98,,,,,,,,,,default,default,,,,,,vm
+TENCENT,all,SA2.MEDIUM4,0.04,59.98,,,,,,,,,,default,default,,,,,,vm
+TENCENT,all,S2.MEDIUM4,0.04,59.98,,,,,,,,,,default,default,,,,,,vm
+TENCENT,all,S5.MEDIUM4,0.03,59.98,,,,,,,,,,default,default,,,,,,vm
+TENCENT,all,S3.MEDIUM8,0.04,59.98,,,,,,,,,,default,default,,,,,,vm
+TENCENT,all,S8.MEDIUM8,0.04,59.98,,,,,,,,,,default,default,,,,,,vm
 TENCENT,all,PNV4.7XLARGE116,1.71,64.18,,,,,,,,,,default,default,gpu,NVIDIA A10,1,24,,vm
 NCP,KR,SPSVRSSD00000005,,,,,,,,,,,,default,default,,,,,,vm
 NCP,KR,SPSVRSSD00000007,,,,,,,,,,,,default,default,,,,,,vm

docker-compose.yaml

@@ -7,7 +7,7 @@ networks:
 services:
   # CB-Tumblebug
   cb-tumblebug:
-    image: cloudbaristaorg/cb-tumblebug:0.9.20
+    image: cloudbaristaorg/cb-tumblebug:0.9.21
     container_name: cb-tumblebug
     build:
       context: .
@@ -33,6 +33,7 @@ services:
       # - TB_SELF_ENDPOINT=xxx.xxx.xxx.xxx:1323
       - TB_SPIDER_REST_URL=http://cb-spider:1024/spider
       - TB_ETCD_ENDPOINTS=http://cb-tumblebug-etcd:2379
+      - TB_TERRARIUM_REST_URL=http://mc-terrarium:8055/terrarium
       # - TB_ETCD_AUTH_ENABLED=true
       # - TB_ETCD_USERNAME=default
       # - TB_ETCD_PASSWORD=default
@@ -163,6 +164,49 @@ services:
       retries: 3
       start_period: 10s
 
+  # # mc-terrarium (PoC): resource extentions such as VPN for CB-Tumblebug by using OpenTofu
+  # mc-terrarium:
+  #   image: cloudbaristaorg/mc-terrarium:0.0.9
+  #   container_name: mc-terrarium
+  #   # build:
+  #   #   context: .
+  #   #   dockerfile: Dockerfile    
+  #   networks:
+  #     - external_network
+  #   ports:
+  #     - target: 8055
+  #       published: 8055
+  #       protocol: tcp
+  #   env_file:
+  #     - ${HOME}/.cloud-barista/secrets/credentials           # AWS credentials
+  #     - ${HOME}/.cloud-barista/secrets/credential-azure.env  # Azure credentials
+  #   volumes:
+  #     - ${HOME}/.cloud-barista/secrets:/app/secrets:ro       # GCP credentials
+  #     - ./container-volume/mc-terrarium-container/.terrarium:/app/.terrarium
+  #   environment:
+  #     # - TERRARIUM_ROOT=/app
+  #     # - TERRARIUM_SELF_ENDPOINT=localhost:8055
+  #     # - TERRARIUM_API_ALLOW_ORIGINS=*
+  #     # - TERRARIUM_API_AUTH_ENABLED=true
+  #     # - TERRARIUM_API_USERNAME=default
+  #     # - TERRARIUM_API_PASSWORD=default
+  #     # - TERRARIUM_LOGFILE_PATH=/app/log/terrarium.log
+  #     # - TERRARIUM_LOGFILE_MAXSIZE=1000
+  #     # - TERRARIUM_LOGFILE_MAXBACKUPS=3
+  #     # - TERRARIUM_LOGFILE_MAXAGE=30
+  #     # - TERRARIUM_LOGFILE_COMPRESS=false
+  #     - TERRARIUM_LOGLEVEL=info
+  #     # - TERRARIUM_LOGWRITER=both
+  #     # - TERRARIUM_NODE_ENV=production
+  #     # - TERRARIUM_AUTOCONTROL_DURATION_MS=10000
+  #   healthcheck:
+  #     test: [ "CMD", "curl", "-f", "http://localhost:8055/terrarium/readyz" ]
+  #     interval: 5m
+  #     timeout: 5s
+  #     retries: 3
+  #     start_period: 10s
+
+
   # # Swagger UI
   # swagger-ui:
   #   image: swaggerapi/swagger-ui