Change bootstrap bundle entrypoint to phase dir

Change-Id: I85151f42e510eb113bcc3bb86d56043d51bf348a
Relates-To: #175

manifests/site/test-bootstrap/ephemeral/bootstrap/kustomization.yaml

@@ -0,0 +1,2 @@
+resources:
+  - ../../../../type/test-bootstrap

manifests/site/test-bootstrap/ephemeral/kustomization.yaml

@@ -1,2 +0,0 @@
-resources:
-  - ../../../type/test-bootstrap

pkg/bootstrap/isogen/command.go

@@ -54,7 +54,7 @@ func GenerateBootstrapIso(settings *environment.AirshipCTLSettings) error {
 
 	// TODO (dukov) replace with the appropriate function once it's available
 	// in document module
-	root, err := globalConf.CurrentContextEntryPoint(config.Ephemeral, "")
+	root, err := globalConf.CurrentContextEntryPoint(config.Ephemeral, config.BootstrapPhase)
 	if err != nil {
 		return err
 	}

pkg/bootstrap/isogen/command_test.go

@@ -59,7 +59,7 @@ func (mc *mockContainer) GetID() string {
 }
 
 func TestBootstrapIso(t *testing.T) {
-	bundle, err := document.NewBundleByPath("testdata/primary/site/test-site/ephemeral")
+	bundle, err := document.NewBundleByPath("testdata/primary/site/test-site/ephemeral/bootstrap")
 	require.NoError(t, err, "Building Bundle Failed")
 
 	tempVol, cleanup := testutil.TempDir(t, "bootstrap-test")

pkg/cluster/initinfra/infra.go

@@ -69,7 +69,7 @@ func (infra *Infra) Deploy() error {
 		return err
 	}
 
-	kustomizePath, err := globalConf.CurrentContextEntryPoint(infra.ClusterType, config.Initinfra)
+	kustomizePath, err := globalConf.CurrentContextEntryPoint(infra.ClusterType, config.InitinfraPhase)
 	if err != nil {
 		return err
 	}

pkg/config/constants.go

@@ -24,7 +24,8 @@ const (
 
 // Constants related to Phases
 const (
-	Initinfra = "initinfra"
+	InitinfraPhase = "initinfra"
+	BootstrapPhase = "bootstrap"
 )
 
 // AllClusterTypes holds cluster types

pkg/remote/remote_direct.go

@@ -98,7 +98,7 @@ func (a *Adapter) initializeAdapter(settings *environment.AirshipCTLSettings) er
 		return config.ErrMissingConfig{What: "RemoteDirect options not defined in bootstrap config"}
 	}
 
-	bundlePath, err := cfg.CurrentContextEntryPoint(config.Ephemeral, "")
+	bundlePath, err := cfg.CurrentContextEntryPoint(config.Ephemeral, config.BootstrapPhase)
 	if err != nil {
 		return err
 	}