Upgrade/3.4.14 (#11)

* Refactor code to align ansible structure * Upgrade to zk 3.4.14 * use hostnames instead of IPs
QingCloudAppcenter · May 19, 2020 · ecccd27 · ecccd27
1 parent e84ac6a
commit ecccd27
Show file tree

Hide file tree

Showing 57 changed files with 706 additions and 378 deletions.
diff --git a/3.4.13/deps/zookeeper-docker/Dockerfile b/3.4.13/deps/zookeeper-docker/Dockerfile
diff --git a/3.4.13/deps/zookeeper-rest-docker/Dockerfile b/3.4.13/deps/zookeeper-rest-docker/Dockerfile
diff --git a/3.4.13/deps/zookeeper-rest-docker/bin/zkRest.sh b/3.4.13/deps/zookeeper-rest-docker/bin/zkRest.sh
diff --git a/3.4.13/vm-image/etc/confd/conf.d/common.sh.toml b/3.4.13/vm-image/etc/confd/conf.d/common.sh.toml
diff --git a/3.4.13/vm-image/etc/confd/conf.d/zoo.cfg.toml b/3.4.13/vm-image/etc/confd/conf.d/zoo.cfg.toml
diff --git a/3.4.13/vm-image/etc/confd/templates/common.sh.tmpl b/3.4.13/vm-image/etc/confd/templates/common.sh.tmpl
diff --git a/3.4.13/vm-image/etc/confd/templates/zoo.cfg.tmpl b/3.4.13/vm-image/etc/confd/templates/zoo.cfg.tmpl
diff --git a/3.4.13/vm-image/lib/systemd/system/post-docker-start.service b/3.4.13/vm-image/lib/systemd/system/post-docker-start.service
diff --git a/3.4.13/vm-image/opt/zkapp/bin/app.sh b/3.4.13/vm-image/opt/zkapp/bin/app.sh
diff --git a/3.4.13/vm-image/opt/zkapp/bin/healthcheck.sh b/3.4.13/vm-image/opt/zkapp/bin/healthcheck.sh
diff --git a/3.4.13/vm-image/opt/zkapp/bin/init.sh b/3.4.13/vm-image/opt/zkapp/bin/init.sh
diff --git a/3.4.13/vm-image/opt/zkapp/bin/metrics.sh b/3.4.13/vm-image/opt/zkapp/bin/metrics.sh
diff --git a/3.4.13/vm-image/opt/zkapp/bin/network.sh b/3.4.13/vm-image/opt/zkapp/bin/network.sh
diff --git a/ansible/.gitignore b/ansible/.gitignore
@@ -0,0 +1,3 @@
+**/files/tmp/
+hosts
+make.retry
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
@@ -0,0 +1 @@
+zk_version: 3.4.14
diff --git a/ansible/make.yml b/ansible/make.yml
@@ -0,0 +1,22 @@
+---
+- name: zk tasks
+  hosts: all
+  vars:
+    target_env: "{{ lookup('env', 'target') }}"
+  tasks:
+  - include_role:
+      name: "{{ name }}"
+    loop:
+    - update-apt-sources-1.0.0
+    - disable-apt-jobs-1.0.0
+    - disable-motd-1.0.0
+    - app-agent-1.0.1
+    - appctl-1.1.0
+    - arping-1.0.0
+    - caddy-1.0.6
+    - java-1.0.1
+    - jq-1.0.3
+    - netcat-openbsd-1.0.0
+    - zookeeper
+    loop_control:
+      loop_var: name
diff --git a/ansible/requirements.yml b/ansible/requirements.yml
@@ -0,0 +1,12 @@
+- src: https://qingcloudappcenter.github.io/ansible-roles/app-agent-1.0.1.tar.gz
+- src: https://qingcloudappcenter.github.io/ansible-roles/appctl-1.1.0.tar.gz
+- src: https://qingcloudappcenter.github.io/ansible-roles/arping-1.0.0.tar.gz
+- src: https://qingcloudappcenter.github.io/ansible-roles/caddy-1.0.6.tar.gz
+- src: https://qingcloudappcenter.github.io/ansible-roles/confd-files-1.0.2.tar.gz
+- src: https://qingcloudappcenter.github.io/ansible-roles/install-1.0.0.tar.gz
+- src: https://qingcloudappcenter.github.io/ansible-roles/java-1.0.1.tar.gz
+- src: https://qingcloudappcenter.github.io/ansible-roles/jq-1.0.3.tar.gz
+- src: https://qingcloudappcenter.github.io/ansible-roles/netcat-openbsd-1.0.0.tar.gz
+- src: https://qingcloudappcenter.github.io/ansible-roles/update-apt-sources-1.0.0.tar.gz
+- src: https://qingcloudappcenter.github.io/ansible-roles/disable-apt-jobs-1.0.0.tar.gz
+- src: https://qingcloudappcenter.github.io/ansible-roles/disable-motd-1.0.0.tar.gz
diff --git a/ansible/roles/zookeeper/files/etc/confd/conf.d/caddy.sh.toml b/ansible/roles/zookeeper/files/etc/confd/conf.d/caddy.sh.toml
@@ -0,0 +1,8 @@
+[template]
+src = "caddy.sh.tmpl"
+dest = "/opt/app/bin/tmpl/caddy.sh"
+mode = "0700"
+keys = [
+  "/",
+]
+reload_cmd = "/opt/app/bin/tmpl/caddy.sh; appctl reload caddy"
diff --git a/ansible/roles/zookeeper/files/etc/confd/conf.d/zkrest.sh.toml b/ansible/roles/zookeeper/files/etc/confd/conf.d/zkrest.sh.toml
@@ -0,0 +1,8 @@
+[template]
+src = "zkrest.sh.tmpl"
+dest = "/opt/app/bin/tmpl/zkrest.sh"
+mode = "0700"
+keys = [
+  "/",
+]
+reload_cmd = "/opt/app/bin/tmpl/zkrest.sh; appctl reload zkrest"