From ea3b64da3a5adb19f34e5a71c220b99e74c75259 Mon Sep 17 00:00:00 2001 From: Trumeet Date: Sat, 3 Apr 2021 16:49:40 -0700 Subject: feat(agent): provision WireGuard before BGP --- .../java/moe/yuuta/dn42peering/agent/grpc/AgentServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agent/src/main/java/moe/yuuta/dn42peering/agent/grpc/AgentServiceImpl.java b/agent/src/main/java/moe/yuuta/dn42peering/agent/grpc/AgentServiceImpl.java index 6ff5a52..1e91020 100644 --- a/agent/src/main/java/moe/yuuta/dn42peering/agent/grpc/AgentServiceImpl.java +++ b/agent/src/main/java/moe/yuuta/dn42peering/agent/grpc/AgentServiceImpl.java @@ -47,10 +47,10 @@ class AgentServiceImpl extends VertxAgentGrpc.AgentVertxImplBase { // TODO: if one operation fails, the following will fail. This may be changed in later. // Changes in each provisioners are executed in sequence. // Two provisioners are executed in sequence. - return bgpProvisioner.calculateChanges(config.getNode(), config.getBgpsList()) - .compose(this::chainChanges) - .compose(_v -> wireGuardProvisioner.calculateChanges(config.getNode(), config.getWgsList()) - .compose(this::chainChanges)) + return wireGuardProvisioner.calculateChanges(config.getNode(), config.getWgsList()) + .compose(this::chainChanges) + .compose(_v -> bgpProvisioner.calculateChanges(config.getNode(), config.getBgpsList()) + .compose(this::chainChanges)) .compose(_v -> wireGuardCleanupProvisioner.calculateChanges(config.getNode(), config.getWgsList()) .compose(this::chainChanges)) .onSuccess(res -> logger.info("Deployment finished. Detailed log can be traced above.")) -- cgit v1.2.3