diff --git a/driver-timebase-ce/Readme.md b/driver-timebase-ce/Readme.md
index 981d18167..4cb3b5b0f 100644
--- a/driver-timebase-ce/Readme.md
+++ b/driver-timebase-ce/Readme.md
@@ -31,14 +31,10 @@ terraform apply --auto-approve
3. Configure software provisioning with Ansible by setting up environment variables from the table below:
-| Variable | Description |
-|-------------------------|----------------------------------------------------|
-| TESTING_REGISTRY_URL | URL of Docker registry, containing Timebase images |
-| TESTING_REGISTRY_USER | Username to access the registry |
-| TESTING_REGISTRY_PASS | Password to access the registry |
-| TESTING_TIMEBASE_IMAGE | Full image name for Timebase |
-| TESTING_TIMEBASE_TAG | Timebase image tag |
-| TESTING_TIMEBASE_SERIAL | Timebase serial number |
+| Variable | Description |
+|------------------------|------------------------------|
+| TESTING_TIMEBASE_IMAGE | Full image name for Timebase |
+| TESTING_TIMEBASE_TAG | Timebase image tag |
4. Provision testing software with Ansible:
diff --git a/driver-timebase-ce/deploy/defaults/main.yml b/driver-timebase-ce/deploy/defaults/main.yml
index 1dc27f44e..a31e29e45 100644
--- a/driver-timebase-ce/deploy/defaults/main.yml
+++ b/driver-timebase-ce/deploy/defaults/main.yml
@@ -19,13 +19,9 @@ deltix_uid: 1666
deltix_gid: 1666
# Containers settings
-deltix_registry_url: "{{ lookup('env','TESTING_REGISTRY_URL') | default('changeme', true)}}"
-deltix_registry_user: "{{ lookup('env','TESTING_REGISTRY_USER') | default('changeme', true)}}"
-deltix_registry_pass: "{{ lookup('env','TESTING_REGISTRY_PASS') | default('changeme', true)}}"
timebase_image: "{{ lookup('env','TESTING_TIMEBASE_IMAGE') | default('changeme', true)}}"
timebase_tag: "{{ lookup('env','TESTING_TIMEBASE_TAG') | default('changeme', true)}}"
-timebase_serial: "{{ lookup('env','TESTING_TIMEBASE_SERIAL') | default('changeme', true)}}"
# Misc
diff --git a/driver-timebase-ce/deploy/roles/benchmark-client/tasks/main.yml b/driver-timebase-ce/deploy/roles/benchmark-client/tasks/main.yml
index 05c33c93e..43c683d44 100644
--- a/driver-timebase-ce/deploy/roles/benchmark-client/tasks/main.yml
+++ b/driver-timebase-ce/deploy/roles/benchmark-client/tasks/main.yml
@@ -54,7 +54,7 @@
- name: Configure Timebase driver
lineinfile:
- dest: '/opt/benchmark/driver-timebase/timebase-ce.yaml'
+ dest: '/opt/benchmark/driver-timebase-ce/timebase-ce.yaml'
regexp: '^connectionUrl'
line: "connectionUrl: dxtick://{{ tb_hosts }}"
diff --git a/driver-timebase-ce/deploy/roles/docker/tasks/main.yml b/driver-timebase-ce/deploy/roles/docker/tasks/main.yml
index 8d028fe0b..8ba5976e2 100644
--- a/driver-timebase-ce/deploy/roles/docker/tasks/main.yml
+++ b/driver-timebase-ce/deploy/roles/docker/tasks/main.yml
@@ -53,6 +53,7 @@
pip:
executable: pip3
name:
+ - urllib3==1.26.15
- docker
- docker-compose
- boto3
diff --git a/driver-timebase-ce/deploy/roles/timebase/tasks/main.yml b/driver-timebase-ce/deploy/roles/timebase/tasks/main.yml
index 446bdd646..55af7aff9 100644
--- a/driver-timebase-ce/deploy/roles/timebase/tasks/main.yml
+++ b/driver-timebase-ce/deploy/roles/timebase/tasks/main.yml
@@ -36,12 +36,6 @@
state: directory
recurse: true
-- name: Login to Deltix registry
- docker_login:
- registry: "{{ deltix_registry_url }}"
- username: "{{ deltix_registry_user }}"
- password: "{{ deltix_registry_pass }}"
-
- name: Run Docker compose
docker_compose:
project_src: "{{ timebase_dir }}"
diff --git a/driver-timebase-ce/deploy/roles/timebase/templates/docker-compose.yml.j2 b/driver-timebase-ce/deploy/roles/timebase/templates/docker-compose.yml.j2
index 3d99ee892..33be9a216 100644
--- a/driver-timebase-ce/deploy/roles/timebase/templates/docker-compose.yml.j2
+++ b/driver-timebase-ce/deploy/roles/timebase/templates/docker-compose.yml.j2
@@ -22,7 +22,6 @@ services:
soft: 65536
hard: 65536
environment:
- - TIMEBASE_SERIAL={{ timebase_serial }}
- JAVA_OPTS=
-Xms8g
-Xmx8g
diff --git a/driver-timebase-cluster/deploy/roles/benchmark-client/tasks/main.yml b/driver-timebase-cluster/deploy/roles/benchmark-client/tasks/main.yml
index c85664cea..cde4e0824 100644
--- a/driver-timebase-cluster/deploy/roles/benchmark-client/tasks/main.yml
+++ b/driver-timebase-cluster/deploy/roles/benchmark-client/tasks/main.yml
@@ -54,7 +54,7 @@
- name: Configure Timebase driver
lineinfile:
- dest: '/opt/benchmark/driver-timebase/timebase-cluster.yaml'
+ dest: '/opt/benchmark/driver-timebase-cluster/timebase-cluster.yaml'
regexp: '^connectionUrl'
line: "connectionUrl: dxctick://{{ tb_hosts }}"
diff --git a/driver-timebase-cluster/deploy/roles/docker/tasks/main.yml b/driver-timebase-cluster/deploy/roles/docker/tasks/main.yml
index 8d028fe0b..a43bf1a08 100644
--- a/driver-timebase-cluster/deploy/roles/docker/tasks/main.yml
+++ b/driver-timebase-cluster/deploy/roles/docker/tasks/main.yml
@@ -53,6 +53,7 @@
pip:
executable: pip3
name:
+ - urllib3==1.26.15
- docker
- docker-compose
- boto3
diff --git a/driver-timebase-cluster/deploy/roles/timebase/templates/admin.properties.j2 b/driver-timebase-cluster/deploy/roles/timebase/templates/admin.properties.j2
index 84eb17104..009dd73c6 100644
--- a/driver-timebase-cluster/deploy/roles/timebase/templates/admin.properties.j2
+++ b/driver-timebase-cluster/deploy/roles/timebase/templates/admin.properties.j2
@@ -21,4 +21,5 @@ TimeBase.cluster.group=tbcluster
TimeBase.cluster.enabled=true
TimeBase.cluster.stream.replicationFactor=2
TimeBase.cluster.blockAllocatorType=MEMBER_KEY
-TimeBase.cluster.leaderEventNotificationAddress={{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}:7082
\ No newline at end of file
+TimeBase.cluster.leaderEventNotificationAddress={{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}:7082
+TimeBase.enableRemoteAccess=true
\ No newline at end of file
diff --git a/driver-timebase-cluster/deploy/roles/timebase/templates/docker-compose.yml.j2 b/driver-timebase-cluster/deploy/roles/timebase/templates/docker-compose.yml.j2
index 3d99ee892..4e12e1296 100644
--- a/driver-timebase-cluster/deploy/roles/timebase/templates/docker-compose.yml.j2
+++ b/driver-timebase-cluster/deploy/roles/timebase/templates/docker-compose.yml.j2
@@ -15,7 +15,7 @@
version: "3"
services:
timebase:
- image: "{{ timebase_image }}:{{ timebase_tag }}"
+ image: "{{ deltix_registry_url }}/{{ timebase_image }}:{{ timebase_tag }}"
stop_grace_period: 5m
ulimits:
nofile:
diff --git a/driver-timebase/deploy/roles/docker/tasks/main.yml b/driver-timebase/deploy/roles/docker/tasks/main.yml
index 8d028fe0b..8ba5976e2 100644
--- a/driver-timebase/deploy/roles/docker/tasks/main.yml
+++ b/driver-timebase/deploy/roles/docker/tasks/main.yml
@@ -53,6 +53,7 @@
pip:
executable: pip3
name:
+ - urllib3==1.26.15
- docker
- docker-compose
- boto3
diff --git a/driver-timebase/deploy/roles/timebase/templates/docker-compose.yml.j2 b/driver-timebase/deploy/roles/timebase/templates/docker-compose.yml.j2
index 3d99ee892..4e12e1296 100644
--- a/driver-timebase/deploy/roles/timebase/templates/docker-compose.yml.j2
+++ b/driver-timebase/deploy/roles/timebase/templates/docker-compose.yml.j2
@@ -15,7 +15,7 @@
version: "3"
services:
timebase:
- image: "{{ timebase_image }}:{{ timebase_tag }}"
+ image: "{{ deltix_registry_url }}/{{ timebase_image }}:{{ timebase_tag }}"
stop_grace_period: 5m
ulimits:
nofile:
diff --git a/pom.xml b/pom.xml
index c1a51e3b6..322364f0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,13 +52,13 @@
-
+ driver-rocketmq
-
-
+ driver-nats
+ driver-nats-streaming
-
+ driver-redis
package
docker