From ec6eaf7d029c86f5fb5559387e6b717600c32f94 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Wed, 26 May 2021 10:17:35 +0200 Subject: [PATCH 1/9] Fix update-dependencies pipeline --- .github/workflows/deps.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml index 290f04beb..8aa7ee6c6 100644 --- a/.github/workflows/deps.yml +++ b/.github/workflows/deps.yml @@ -9,10 +9,6 @@ jobs: steps: - uses: actions/checkout@v2 - uses: cachix/install-nix-action@v12 - with: - name: wire-server - signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}" - authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: Niv update run: | nix run -f . niv -c niv update From aaf6d41014df9c05f2caa0ee141052b2a4703317 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Fri, 28 May 2021 11:31:38 +0200 Subject: [PATCH 2/9] roles/ansible-cassandra: v0.1.4 --- ansible/roles-external/ansible-cassandra | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles-external/ansible-cassandra b/ansible/roles-external/ansible-cassandra index 5557dd416..8a0f029f5 160000 --- a/ansible/roles-external/ansible-cassandra +++ b/ansible/roles-external/ansible-cassandra @@ -1 +1 @@ -Subproject commit 5557dd416047e9d9e1d1baf955ae3ce841e2c702 +Subproject commit 8a0f029f533856e8270d7fd74d75c099a677b2e3 From 27e653e8fe8d391102282fbdbb9e38970733092e Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Mon, 31 May 2021 17:45:26 +0200 Subject: [PATCH 3/9] Add dependabot config --- .dependabot/config.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .dependabot/config.yml diff --git a/.dependabot/config.yml b/.dependabot/config.yml new file mode 100644 index 000000000..69ca78cbe --- /dev/null +++ b/.dependabot/config.yml @@ -0,0 +1,12 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + - package-ecosystem: "gitsubmodule" + directory: "/ansible/roles-external" + schedule: + interval: "daily" + + From 41fd472f49940bbc563809c3287039cf0dafbd89 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Mon, 31 May 2021 17:47:17 +0200 Subject: [PATCH 4/9] Move dependabot to right location --- .dependabot/config.yml => .github/dependabot.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .dependabot/config.yml => .github/dependabot.yml (100%) diff --git a/.dependabot/config.yml b/.github/dependabot.yml similarity index 100% rename from .dependabot/config.yml rename to .github/dependabot.yml From 71edea0155673036e9db73d021676d74b3895dc6 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Mon, 31 May 2021 17:48:35 +0200 Subject: [PATCH 5/9] [skip ci] point to correct location of .gitmodules --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 69ca78cbe..61c880d0a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,7 +5,7 @@ updates: schedule: interval: "daily" - package-ecosystem: "gitsubmodule" - directory: "/ansible/roles-external" + directory: "/" schedule: interval: "daily" From c1716ab0dd427bf6312f783aa84d3999eec63fa8 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Mon, 31 May 2021 17:53:16 +0200 Subject: [PATCH 6/9] [skip ci] remove non-existent submodule --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1d0899af2..f747a0e2a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,9 +40,6 @@ [submodule "ansible/roles-external/sft"] path = ansible/roles-external/sft url = https://github.com/wireapp/ansible-sft.git -[submodule "ansible/andrewrothstein.unarchive-deps"] - path = ansible/andrewrothstein.unarchive-deps - url = https://github.com/andrewrothstein/ansible-unarchive-deps [submodule "ansible/roles-external/andrewrothstein.unarchive-deps"] path = ansible/roles-external/andrewrothstein.unarchive-deps url = https://github.com/andrewrothstein/ansible-unarchive-deps From bd0f958cfe44f1be9bd7b7352b734be2e2bee9ef Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Wed, 2 Jun 2021 16:49:20 +0200 Subject: [PATCH 7/9] Update default.nix --- default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/default.nix b/default.nix index 0996e6520..91777a7ed 100644 --- a/default.nix +++ b/default.nix @@ -62,6 +62,7 @@ rec { pkgs.coreutils pkgs.bashInteractive pkgs.openssh # ansible needs this too, even with paramiko + pkgs.sshpass # needed for password login # The enivronment env From 389317d413d7fe5da1749d523d55820622520108 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Mon, 7 Jun 2021 17:33:36 +0200 Subject: [PATCH 8/9] Fix offline check This would fail if the variable was not defined --- ansible/cassandra.yml | 4 ++-- ansible/kubernetes.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ansible/cassandra.yml b/ansible/cassandra.yml index 402337884..8500bfe36 100644 --- a/ansible/cassandra.yml +++ b/ansible/cassandra.yml @@ -15,7 +15,7 @@ - role: ansible-role-ntp tags: - ntp - when: not offline + when: not (offline|default(false)) - role: ansible-role-java tags: @@ -28,7 +28,7 @@ - role: ansible-ntp-verify tags: - ntp - when: not offline + when: not (offline|default(false)) tasks: # these are optional debug tasks to see that the cluser has come up sucessfully - shell: nodetool status diff --git a/ansible/kubernetes.yml b/ansible/kubernetes.yml index 6b076cd5a..37e424c78 100644 --- a/ansible/kubernetes.yml +++ b/ansible/kubernetes.yml @@ -20,7 +20,6 @@ become: no tasks: - delegate_to: localhost - when: not offline block: - name: "Checking if 'kubeconfig' file already exists" stat: From 340ff0ad0dea6c2dd71c0c58f46de600ff6c7b1d Mon Sep 17 00:00:00 2001 From: Gregor Date: Thu, 10 Jun 2021 13:06:49 +0200 Subject: [PATCH 9/9] Create release 2021-06-10 # Changelog ## Fixes * update Cassandra role (#455) * fix automated Ansible deployment (#468) --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c5dda557..88649cad1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,14 @@ +# 2021-06-10 + +## Fixes + +* update Cassandra role (#455) +* fix automated Ansible deployment (#468) + + # 2021-05-10 ## Features