@@ -76,6 +76,7 @@ func NewCmdIPFailoverConfig(f *clientcmd.Factory, parentName, name string, out i

 	cmd.Flags().BoolVar(&options.ImageTemplate.Latest, "latest-images", options.ImageTemplate.Latest, "If true, attempt to use the latest images instead of the current release")

 	cmd.Flags().StringVarP(&options.Selector, "selector", "l", options.Selector, "Selector (label query) to filter nodes on.")

 	cmd.Flags().StringVar(&options.Credentials, "credentials", "", "Path to a .kubeconfig file that will contain the credentials the router should use to contact the master.")

+	cmd.Flags().StringVar(&options.ServiceAccount, "service-account", options.ServiceAccount, "Name of the service account to use to run the ipfailover pod.")

 	cmd.Flags().BoolVar(&options.Create, "create", options.Create, "Create the configuration if it does not exist.")

@@ -155,10 +155,11 @@ func GenerateDeploymentConfig(name string, options *ipfailover.IPFailoverConfigC

 	podTemplate := &kapi.PodTemplateSpec{

 		ObjectMeta: kapi.ObjectMeta{Labels: selector},

 		Spec: kapi.PodSpec{

-			HostNetwork:  true,

-			NodeSelector: generateNodeSelector(name, selector),

-			Containers:   containers,

-			Volumes:      generateVolumeConfig(),

+			HostNetwork:    true,

+			NodeSelector:   generateNodeSelector(name, selector),

+			Containers:     containers,

+			Volumes:        generateVolumeConfig(),

+			ServiceAccount: options.ServiceAccount,

 		},

 	}

@@ -9,7 +9,7 @@ import (

 	"github.com/openshift/origin/pkg/ipfailover"

 )

-func makeIPFailoverConfigOptions(selector string, replicas int) *ipfailover.IPFailoverConfigCmdOptions {

+func makeIPFailoverConfigOptions(selector string, replicas int, serviceAccount string) *ipfailover.IPFailoverConfigCmdOptions {

 	return &ipfailover.IPFailoverConfigCmdOptions{

 		ImageTemplate:    variable.NewDefaultImageTemplate(),

 		Selector:         selector,

@@ -17,6 +17,7 @@ func makeIPFailoverConfigOptions(selector string, replicas int) *ipfailover.IPFa

 		WatchPort:        80,

 		NetworkInterface: "eth0",

 		Replicas:         replicas,

+		ServiceAccount:   serviceAccount,

 	}

 }

@@ -36,6 +37,7 @@ func TestGenerateDeploymentConfig(t *testing.T) {

 		Selector          string

 		Replicas          int

 		PodSelectorLength int

+		ServiceAccount    string

 	}{

 		{

 			Name:              "config-test-no-selector",

@@ -73,10 +75,17 @@ func TestGenerateDeploymentConfig(t *testing.T) {

 			Replicas:          42,

 			PodSelectorLength: 4,

 		},

+		{

+			Name:              "config-test-service-account",

+			Selector:          "router=geo-us-west",

+			Replicas:          3,

+			PodSelectorLength: 1,

+			ServiceAccount:    "foo",

+		},

 	}

 	for _, tc := range tests {

-		options := makeIPFailoverConfigOptions(tc.Selector, tc.Replicas)

+		options := makeIPFailoverConfigOptions(tc.Selector, tc.Replicas, tc.ServiceAccount)

 		selector := makeSelector(options)

 		dc, err := GenerateDeploymentConfig(tc.Name, options, selector)

 		if err != nil {

@@ -96,6 +105,10 @@ func TestGenerateDeploymentConfig(t *testing.T) {

 			t.Errorf("Test case for %s got HostNetwork disabled where HostNetwork was expected to be enabled", tc.Name)

 		}

+		if podSpec.ServiceAccount != tc.ServiceAccount {

+			t.Errorf("Test case for %s got service account %s when expecting %s", tc.Name, podSpec.ServiceAccount, tc.ServiceAccount)

+		}

+

 		psLength := len(podSpec.NodeSelector)

 		if tc.PodSelectorLength != psLength {

 			t.Errorf("Test case for %s got pod spec NodeSelector length %v where %v was expected",

@@ -26,12 +26,13 @@ const (

 // IPFailoverConfigCmdOptions are options supported by the IP Failover admin command.

 type IPFailoverConfigCmdOptions struct {

-	Type          string

-	ImageTemplate variable.ImageTemplate

-	Credentials   string

-	ServicePort   int

-	Selector      string

-	Create        bool

+	Type           string

+	ImageTemplate  variable.ImageTemplate

+	Credentials    string

+	ServicePort    int

+	Selector       string

+	Create         bool

+	ServiceAccount string

 	//  Failover options.

 	VirtualIPs       string