Fix/add dynamic config (#11)

avpash43 · ViachaslauKabak · commit cd473fa3403b · 2019-05-27T12:19:13.000+03:00
* Role refactoring

* add changes for dynamic file path

* Add 3.5.x installation and tests
diff --git a/README.md b/README.md
@@ -33,11 +33,13 @@ Role Variables
 
  - `zk_url` - download url
 
-    default: `http://www.us.apache.org/dist/zookeeper/zookeeper-{{zk_version}}/zookeeper-{{zk_version}}.tar.gz`
+    default: `http://www.us.apache.org/dist/zookeeper/zookeeper-{{zk_version}}/zookeeper-{{zk_version}}.tar.gz` for versions < 3.5
+
+    default: `http://www.us.apache.org/dist/zookeeper/zookeeper-{{zk_version}}/apache-zookeeper-{{zk_version}}-bin.tar.gz` for versions 3.5.x
 
  - `zk_tarball_installation` - installation from tarball(or repository)
 
-    default: `True`
+    default: `true`
 
  - `zk_user` - OS user name for zookeeper
 
@@ -93,7 +95,11 @@ Role Variables
 
  - `zk_force_myid` - to reset id
 
-    default: `True`
+    default: `true`
+
+ - `zk_force_config` - to rewrite config files
+
+    default: `true`
 
  - `zk_tarball_dir` - place where you download tarball
 
@@ -117,17 +123,34 @@ Role Variables
 
   - `zk_service_start` - to start zookeeper service in the end of role/Playbook
 
-    default: `True`
+    default: `true`
 
   - `zk_service_autostart` - Add zookeeper service to automatically start.
 
-    default: `True`
+    default: `true`
+
+  - `zk_reconfig_enabled` - This option is introduced such that the reconfiguration feature can be completely disabled and any attempts to reconfigure a cluster through reconfig API with or without authentication will fail by default
+
+    default: `true`
 
 Dependencies
 ------------
 
 https://github.com/lean-delivery/ansible-role-java
 
+Example Inventory
+----------------
+```ini
+ [zookeeper]
+ zookeeper1 zk_server_role=participant
+ zookeeper2 zk_server_role=observer
+ zookeeper3
+ ```
+
+  - `zk_server_role` - zookeeper server role. Host variable. Variables: participant, observer
+
+    default:  participant
+
 Example Playbook
 ----------------
 
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,7 +1,8 @@
 ---
+zk_config: []
 zk_version: 3.4.14
-zk_url: 'http://www.us.apache.org/dist/zookeeper/zookeeper-{{zk_version}}/zookeeper-{{zk_version}}.tar.gz'
-zk_tarball_installation: True
+zk_url: '{{ default_zk_url }}'
+zk_tarball_installation: true
 zk_user: zookeeper
 zk_group: zookeeper
 zk_debian_apt_repositories: 'deb http://us-east1.gce.archive.ubuntu.com/ubuntu/ bionic universe'
@@ -13,16 +14,18 @@ zk_tick_time: 2000
 zk_autopurge_purgeInterval: 0
 zk_autopurge_snapRetainCount: 10
 # 3.5.0 and later
+zk_reconfig_enabled: 'true'
 zk_standalone_enabled: 'true'
 zk_data_dir: /var/lib/zookeeper
 zk_log_dir: /var/log/zookeeper
 zk_dir: '{{ zk_tarball_installation | ternary("/opt/zookeeper-" + zk_version, "/usr/lib/zookeeper") }}'
-zk_force_myid: True
+zk_force_myid: true
+zk_force_config: true
 zk_tarball_dir: /opt/src
 zk_rolling_log_file_max_size: 10MB
 zk_max_rolling_log_file_count: 10
 zk_inventory_group: zookeeper
 
 zk_service_name: zookeeper
-zk_service_start: True
-zk_service_autostart: True
+zk_service_start: true
+zk_service_autostart: true
diff --git a/handlers/main.yml b/handlers/main.yml
@@ -3,6 +3,6 @@
   systemd:
     name: zookeeper
     state: restarted
-  become: True
+  become: true
   when:
     - zk_service_start
diff --git a/molecule/cloud-aws-direct/molecule.yml b/molecule/cloud-aws-direct/molecule.yml
@@ -15,7 +15,7 @@ platforms:
     instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-05a2ef2b767afec50
-    assign_public_ip: False
+    assign_public_ip: false
     spot_price: 0.04
     security_group_name:
       - default
@@ -32,7 +32,7 @@ platforms:
     instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-05a2ef2b767afec50
-    assign_public_ip: False
+    assign_public_ip: false
     security_group_name:
       - default
     spot_price: 0.04
@@ -48,7 +48,7 @@ platforms:
     instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-05a2ef2b767afec50
-    assign_public_ip: False
+    assign_public_ip: false
     security_group_name:
       - default
     spot_price: 0.04
@@ -65,7 +65,7 @@ platforms:
     instance_type: m5.large
     region: us-east-1
     vpc_subnet_id: subnet-05a2ef2b767afec50
-    assign_public_ip: False
+    assign_public_ip: false
     spot_price: 0.04
     security_group_name:
       - default
@@ -78,11 +78,11 @@ platforms:
 
 provisioner:
   name: ansible
-  log: False
+  log: false
   inventory:
     group_vars:
       package_install:
-        zk_tarball_installation: False
+        zk_tarball_installation: false
   playbooks:
     create: ../resources/provisioning/AWS/create.yml
     prepare: ../resources/provisioning/AWS/prepare.yml
diff --git a/molecule/cloud-aws-direct/playbook.yml b/molecule/cloud-aws-direct/playbook.yml
@@ -4,4 +4,7 @@
   roles:
     - role: lean_delivery.java
     - role: ansible-role-zookeeper
-      zk_force_myid: False
+      zk_force_myid: false
+      zk_force_config: false
+      zk_config:
+          maxClientCnxns: 60
diff --git a/molecule/cloud-epc-delegated/molecule.yml b/molecule/cloud-epc-delegated/molecule.yml
@@ -28,7 +28,7 @@ platforms:
       - zookeeper_ubuntu
 provisioner:
   name: ansible
-  log: True
+  log: true
   playbooks:
     create: ../resources/provisioning/EPC/create.yml
     prepare: ../resources/provisioning/EPC/prepare.yml
diff --git a/molecule/cloud-epc-delegated/playbook.yml b/molecule/cloud-epc-delegated/playbook.yml
@@ -4,4 +4,7 @@
   roles:
     - role: lean_delivery.java
     - role: ansible-role-zookeeper
-      zk_force_myid: False
+      zk_force_myid: false
+      zk_force_config: false
+      zk_config:
+          maxClientCnxns: 60
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -12,13 +12,13 @@ lint:
 platforms:
   - name: test-docker-centos7-zookeeper
     image: leandelivery/docker-systemd:centos7
-    privileged: True
+    privileged: true
     groups:
       - zookeeper
       - zookeeper_centos
   - name: test-docker-ubuntu1804-zookeeper
     image: leandelivery/docker-systemd:ubuntu-18.04
-    privileged: True
+    privileged: true
     security_opts:
       - seccomp=unconfined
     volumes:
diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml
@@ -4,4 +4,6 @@
   roles:
     - role: lean_delivery.java
     - role: ansible-role-zookeeper
-      zk_force_myid: False
+      zk_force_myid: false
+      zk_force_config: false
+      zk_version: 3.5.5
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -5,15 +5,15 @@
 - name: Enable zookeeper service
   service:
     name: '{{ zk_service_name }}'
-    enabled: True
-  become: True
+    enabled: true
+  become: true
   when:
     - zk_service_autostart
 
 - name: Start service
   service:
     name: '{{ zk_service_name }}'
     state: started
-  become: True
+  become: true
   when:
     - zk_service_start
diff --git a/tasks/package_install/Debian.yml b/tasks/package_install/Debian.yml
@@ -7,6 +7,6 @@
   delay: 3
   register: installed_repo
   until: installed_repo is success
-  become: True
+  become: true
 
 - include_tasks: Linux.yml
diff --git a/tasks/package_install/Linux.yml b/tasks/package_install/Linux.yml
@@ -23,12 +23,10 @@
       dest: '{{ zk_package_config_dir }}/{{ config }}'
       owner: '{{ zk_user }}'
       group: '{{ zk_group }}'
-    loop:
-      - zoo.cfg
-      - log4j.properties
+    loop: '{{ zk_config_file_list }}'
     loop_control:
       loop_var: config
     notify:
       - restart Zookeeper
 
-  become: True
+  become: true
diff --git a/tasks/package_install/RedHat.yml b/tasks/package_install/RedHat.yml
@@ -3,10 +3,10 @@
   yum:
     name: '{{ zk_redhat_yum_repositories }}'
     state: present
-    disable_gpg_check: True
+    disable_gpg_check: true
   register: installed_repo
   until: installed_repo is succeeded
-  become: True
+  become: true
 
 - include_tasks: Linux.yml
 
diff --git a/tasks/service/systemd.yml b/tasks/service/systemd.yml
@@ -3,6 +3,6 @@
   template:
     src: zookeeper.service.j2
     dest: '/lib/systemd/system/{{ zk_service_name }}.service'
-  become: True
+  become: true
   notify:
     - restart Zookeeper
diff --git a/tasks/service/systemv.yml b/tasks/service/systemv.yml
@@ -3,6 +3,6 @@
   template:
     src: zookeeper.conf.j2
     dest: '/etc/init/{{ zk_service_name }}.conf'
-  become: True
+  become: true
   notify:
     - restart Zookeeper
diff --git a/tasks/tarball_install.yml b/tasks/tarball_install.yml
@@ -4,13 +4,13 @@
   - name: Group creation
     group:
       name: '{{ zk_group }}'
-      system: True
+      system: true
 
   - name: User creation
     user:
       name: '{{ zk_user }}'
       group: '{{ zk_group }}'
-      system: True
+      system: true
 
   - name: 'Ensure the tarball dir exists at {{ zk_tarball_dir }}'
     file:
@@ -55,7 +55,7 @@
 
   - name: Unpack tarball
     unarchive:
-      remote_src: True
+      remote_src: true
       src: '{{ zk_tarball_dir }}/zookeeper-{{ zk_version }}.tar.gz'
       dest: '{{ zk_dir }}'
       extra_opts: '--strip-components=1'
@@ -85,15 +85,14 @@
     notify:
       - restart Zookeeper
 
-  - name: Configure zookeeper zoo.cfg and log4j
+  - name: Add zookeeper config files
     template:
       src: '{{ config }}.j2'
       dest: '{{ zk_dir }}/conf/{{ config }}'
       owner: '{{ zk_user }}'
       group: '{{ zk_group }}'
-    loop:
-      - zoo.cfg
-      - log4j.properties
+      force: '{{ zk_force_config }}'
+    loop: '{{ zk_config_file_list }}'
     loop_control:
       loop_var: config
     notify:
@@ -105,7 +104,7 @@
       dest: /etc/profile.d/zookeeper_path.sh
       mode: 0755
 
-  become: True
+  become: true
 
 - name: Set system service
   include_tasks: '{{ service_manager }}'
diff --git a/templates/zoo.cfg.dynamic.j2 b/templates/zoo.cfg.dynamic.j2
@@ -0,0 +1,16 @@
+{%- set ips = [] %}
+{%- for host in groups[zk_inventory_group] %}
+{{- ips.append(dict(id=loop.index, host=host, ip=hostvars[host]['ansible_default_ipv4'].address, role=hostvars[host]['zk_server_role'])) }}
+{%- endfor %}
+
+{% for server in ips %}
+{% if server.host is defined %}
+{% if server.ip is defined %}
+server.{{server.id}}={{server.ip}}:2888:3888:{{ server.role | default ("participant") }};{{ zk_client_port }}
+{% else %}
+server.{{server.id}}={{server.host}}:2888:3888:{{ server.role | default ("participant") }};{{ zk_client_port }}
+{% endif %}
+{% else %}
+server.{{loop.index}}={{server}}:2888:3888:{{ server.role | default ("participant") }};{{ zk_client_port }}
+{% endif %}
+{% endfor %}
diff --git a/templates/zoo.cfg.j2 b/templates/zoo.cfg.j2
@@ -1,21 +1,34 @@
 tickTime={{ zk_tick_time }}
 dataDir={{ zk_data_dir }}
 dataLogDir={{ zk_log_dir }}
-clientPort={{ zk_client_port }}
 initLimit={{ zk_init_limit }}
 syncLimit={{ zk_sync_limit }}
-
 {% if zk_autopurge_purgeInterval > 0 %}
 autopurge.purgeInterval={{ zk_autopurge_purgeInterval }}
 autopurge.snapRetainCount={{ zk_autopurge_snapRetainCount }}
 {% endif %}
+{% if (zk_version is version_compare('3.5.0', '>=')) %}
+{% if zk_tarball_installation %}
+dynamicConfigFile={{ zk_dir }}/conf/zoo.cfg.dynamic
+{% else %}
+dynamicConfigFile={{ zk_package_config_dir }}/zoo.cfg.dynamic
+{% endif %}
+reconfigEnabled={{ zk_reconfig_enabled }}
+standaloneEnabled={{ zk_standalone_enabled }}
+{% endif %}
+{% if zk_config | length %}
+{{ zk_config | to_nice_yaml | regex_replace(': ','=')}}
+{% endif %}
+{% if (zk_version is version_compare('3.5.0', '<')) %}
+clientPort={{ zk_client_port }}
+{% endif %}
 
+{% if (zk_version is version_compare('3.5.0', '<')) %}
 {%- set ips = [] %}
 {%- for host in groups[zk_inventory_group] %}
 {{- ips.append(dict(id=loop.index, host=host, ip=hostvars[host]['ansible_default_ipv4'].address)) }}
 {%- endfor %}
 
-{% if (zk_version is version_compare('3.5.0', '<')) %}
 {% for server in ips %}
 {% if server.host is defined %}
 {% if server.ip is defined %}
diff --git a/vars/main.yml b/vars/main.yml
