Playbooks fixes

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:
 

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
 

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 }}"
 

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

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 }}"

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

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 }}"
 

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

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
+TimeBase.cluster.leaderEventNotificationAddress={{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}:7082
+TimeBase.enableRemoteAccess=true

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:

driver-timebase/deploy/roles/docker/tasks/main.yml

@@ -53,6 +53,7 @@
   pip:
     executable: pip3
     name: 
+      - urllib3==1.26.15 
       - docker
       - docker-compose
       - boto3

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:

pom.xml

@@ -52,13 +52,13 @@
         <!--        <module>driver-rabbitmq</module>-->
         <!--        <module>driver-artemis</module>-->
         <!--        <module>driver-bookkeeper</module>-->
-        <!--        <module>driver-rocketmq</module>-->
+        <module>driver-rocketmq</module>
         <!--        <module>driver-timebase</module>-->
-        <!--        <module>driver-nats</module>-->
-        <!--        <module>driver-nats-streaming</module>-->
+        <module>driver-nats</module>
+        <module>driver-nats-streaming</module>
         <!--        <module>driver-nsq</module>-->
         <!--        <module>driver-jms</module>-->
-        <!--        <module>driver-redis</module>-->
+        <module>driver-redis</module>
         <module>package</module>
         <module>docker</module>
         <!--<module>driver-kop</module>-->