From aa41b49246d84b605a76d169f0c861ba0691a4fb Mon Sep 17 00:00:00 2001 From: Ritu Sood Date: Tue, 30 Jul 2019 15:40:55 -0700 Subject: Consolidate OVN related code under ovn dir This patch is a cleanup patch and doesn't introduce any fuctionality changes. Includes removing of unused code and rearranging code. Change-Id: Idf4a36e09a6d5c200cf191c995184076ffa0326d Signed-off-by: Ritu Sood --- cmd/ovn4nfvk8s/ovn4nfvk8s.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'cmd') diff --git a/cmd/ovn4nfvk8s/ovn4nfvk8s.go b/cmd/ovn4nfvk8s/ovn4nfvk8s.go index 0c0cc2e..607b07f 100644 --- a/cmd/ovn4nfvk8s/ovn4nfvk8s.go +++ b/cmd/ovn4nfvk8s/ovn4nfvk8s.go @@ -15,7 +15,6 @@ import ( "ovn4nfv-k8s-plugin/internal/pkg/config" "ovn4nfv-k8s-plugin/internal/pkg/factory" "ovn4nfv-k8s-plugin/internal/pkg/ovn" - "ovn4nfv-k8s-plugin/internal/pkg/util" ) func main() { @@ -95,7 +94,7 @@ func runOvnKube(ctx *cli.Context) error { } } - if err = util.SetExec(exec); err != nil { + if err = ovn.SetExec(exec); err != nil { logrus.Errorf("Failed to initialize exec helper: %v", err) return err } @@ -106,7 +105,7 @@ func runOvnKube(ctx *cli.Context) error { } // Create distributed router and gateway for the deployment - err = ovn.SetupMaster("ovn4nfv-master") + err = ovn.SetupDistributedRouter("ovn4nfv-master") if err != nil { logrus.Errorf(err.Error()) panic(err.Error()) -- cgit