Skip to content

Commit dce25d0

Browse files
committed
Revert "[fix] Updated zerotier network name from ow_zt to global #982"
This reverts commit dcf2524. Unfortunately there's no way to add this migration on the 1.1 branch without causing issues when upgrading to the next version.
1 parent 5e1a105 commit dce25d0

File tree

3 files changed

+2
-27
lines changed

3 files changed

+2
-27
lines changed

openwisp_controller/config/base/vpn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ def auto_client(self, auto_cert=True, template_backend_class=None):
634634
# call auto_client and update the config
635635
elif self._is_backend_type('zerotier') and template_backend_class:
636636
auto = getattr(template_backend_class, 'zerotier_auto_client')(
637-
name='global',
637+
name='ow_zt',
638638
networks=[
639639
{'id': self.network_id, 'ifname': f'owzt{self.network_id[-6:]}'}
640640
],

openwisp_controller/config/migrations/0059_zerotier_templates_ow_zt_to_global.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

openwisp_controller/config/tests/test_vpn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,7 @@ def test_zerotier_auto_client(self, mock_requests, mock_subprocess):
12101210
for key in context_keys.keys():
12111211
context_keys[key] = '{{%s}}' % context_keys[key]
12121212
expected = template.backend_class.zerotier_auto_client(
1213-
name='global',
1213+
name='ow_zt',
12141214
networks=[{'id': vpn.network_id, 'ifname': f'owzt{vpn.network_id[-6:]}'}],
12151215
identity_secret=context_keys['secret'],
12161216
)

0 commit comments

Comments
 (0)