Skip to content
This repository was archived by the owner on Jan 21, 2020. It is now read-only.

Commit 6eeda29

Browse files
FrenchBenDavid Chung
authored andcommitted
Fix zookeeper (#749)
* Fix allocationMethod for zookeeper example Signed-off-by: French Ben <[email protected]> * Clean Makefile spacing Signed-off-by: French Ben <[email protected]>
1 parent cb07f10 commit 6eeda29

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,6 @@ endif
157157

158158
binaries: clean build-binaries build-plugin-start-scripts
159159
build-binaries: build/infrakit
160-
161-
162160
@echo "+ $@"
163161
ifneq (,$(findstring .m,$(VERSION)))
164162
@echo "\nWARNING - repository contains uncommitted changes, tagged binaries as dirty\n"

examples/flavor/zookeeper/flavor.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"strings"
88
"text/template"
99

10-
group_types "github.com/docker/infrakit/pkg/plugin/group/types"
1110
"github.com/docker/infrakit/pkg/spi/flavor"
11+
"github.com/docker/infrakit/pkg/spi/group"
1212
"github.com/docker/infrakit/pkg/spi/instance"
1313
"github.com/docker/infrakit/pkg/types"
1414
)
@@ -36,7 +36,7 @@ func parseSpec(flavorProperties *types.Any) (spec, error) {
3636
return s, err
3737
}
3838

39-
func (z zkFlavor) Validate(flavorProperties *types.Any, allocation group_types.AllocationMethod) error {
39+
func (z zkFlavor) Validate(flavorProperties *types.Any, allocation group.AllocationMethod) error {
4040
properties, err := parseSpec(flavorProperties)
4141
if err != nil {
4242
return err
@@ -159,8 +159,8 @@ func (z zkFlavor) Drain(flavorProperties *types.Any, inst instance.Description)
159159

160160
func (z zkFlavor) Prepare(flavorProperties *types.Any,
161161
spec instance.Spec,
162-
allocation group_types.AllocationMethod,
163-
index group_types.Index) (instance.Spec, error) {
162+
allocation group.AllocationMethod,
163+
index group.Index) (instance.Spec, error) {
164164

165165
properties, err := parseSpec(flavorProperties)
166166
if err != nil {

0 commit comments

Comments
 (0)