Skip to content

Commit 8554eda

Browse files
authored
Merge pull request #469 from wireapp/release_2021_06_10
Release 2021-06-10
2 parents df43a17 + 340ff0a commit 8554eda

8 files changed

Lines changed: 24 additions & 11 deletions

File tree

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
- package-ecosystem: "gitsubmodule"
8+
directory: "/"
9+
schedule:
10+
interval: "daily"
11+
12+

.github/workflows/deps.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v2
1111
- uses: cachix/install-nix-action@v12
12-
with:
13-
name: wire-server
14-
signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
15-
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
1612
- name: Niv update
1713
run: |
1814
nix run -f . niv -c niv update

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@
4040
[submodule "ansible/roles-external/sft"]
4141
path = ansible/roles-external/sft
4242
url = https://github.com/wireapp/ansible-sft.git
43-
[submodule "ansible/andrewrothstein.unarchive-deps"]
44-
path = ansible/andrewrothstein.unarchive-deps
45-
url = https://github.com/andrewrothstein/ansible-unarchive-deps
4643
[submodule "ansible/roles-external/andrewrothstein.unarchive-deps"]
4744
path = ansible/roles-external/andrewrothstein.unarchive-deps
4845
url = https://github.com/andrewrothstein/ansible-unarchive-deps

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212

1313

1414

15+
# 2021-06-10
16+
17+
## Fixes
18+
19+
* update Cassandra role (#455)
20+
* fix automated Ansible deployment (#468)
21+
22+
1523
# 2021-05-10
1624

1725
## Features

ansible/cassandra.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
- role: ansible-role-ntp
1616
tags:
1717
- ntp
18-
when: not offline
18+
when: not (offline|default(false))
1919

2020
- role: ansible-role-java
2121
tags:
@@ -28,7 +28,7 @@
2828
- role: ansible-ntp-verify
2929
tags:
3030
- ntp
31-
when: not offline
31+
when: not (offline|default(false))
3232
tasks:
3333
# these are optional debug tasks to see that the cluser has come up sucessfully
3434
- shell: nodetool status

ansible/kubernetes.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
become: no
2121
tasks:
2222
- delegate_to: localhost
23-
when: not offline
2423
block:
2524
- name: "Checking if 'kubeconfig' file already exists"
2625
stat:

default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ rec {
6262
pkgs.coreutils
6363
pkgs.bashInteractive
6464
pkgs.openssh # ansible needs this too, even with paramiko
65+
pkgs.sshpass # needed for password login
6566

6667
# The enivronment
6768
env

0 commit comments

Comments
 (0)