Merge pull request #39 from itsouvalas/params_hostname

Update FQDN and provide params.hostname

manifest.go

@@ -133,6 +133,7 @@ func UploadReleasesFromManifest(raw string, bosh *gogobosh.Client, l *Log) error
 func GetCreds(id string, plan Plan, bosh *gogobosh.Client, l *Log) (interface{}, error) {
 	var jobs []*Job
 	jobsYAML := make(map[string][]*Job)
+	var dnsname string
 
 	deployment := plan.ID + "-" + id
 
@@ -160,11 +161,16 @@ func GetCreds(id string, plan Plan, bosh *gogobosh.Client, l *Log) (interface{},
 			vm.ID,
 			plan.ID,
 			plan.Name,
-			vm.ID + "." + plan.ID + "." + network + "." + deployment + ".bosh",
+			vm.ID + "." + plan.Type + "." + network + "." + deployment + ".bosh",
 			vm.IPs,
 			vm.DNS,
 		}
 		l.Debug("found job {name: %s, deployment: %s, id: %s, plan_id: %s, plan_name: %s, fqdn: %s, ips: [%s], dns: [%s]", job.Name, job.Deployment, job.ID, job.PlanID, job.PlanName, job.FQDN, strings.Join(vm.IPs, ", "), strings.Join(vm.DNS, ", "))
+		dnsname = job.FQDN
+		if job.PlanName != "single-node" {
+			dnsname = strings.Replace(dnsname, ".standalone.", ".node.", 1)
+		}
+
 		jobs = append(jobs, &job)
 
 		if typ, ok := byType[vm.JobName]; ok {
@@ -218,6 +224,7 @@ func GetCreds(id string, plan Plan, bosh *gogobosh.Client, l *Log) (interface{},
 
 	params := make(map[interface{}]interface{})
 	params["instance_id"] = id
+	params["hostname"] = dnsname
 
 	manifest, err := GenManifest(plan, jobsIfc, plan.Credentials, defaults, wrap("params", params))
 	if err != nil {

services.go

@@ -14,6 +14,7 @@ type Plan struct {
 	Name        string `yaml:"name" json:"name"`
 	Description string `yaml:"description" json:"description"`
 	Limit       int    `yaml:"limit" json:"limit"`
+	Type        string `yaml:"type" json:"type"`
 
 	Manifest       map[interface{}]interface{} `json:"-"`
 	Credentials    map[interface{}]interface{} `json:"-"`
@@ -25,6 +26,7 @@ type Plan struct {
 type Service struct {
 	ID          string   `yaml:"id" json:"id"`
 	Name        string   `yaml:"name" json:"name"`
+	Type        string   `yaml:"type" json:"type"`
 	Description string   `yaml:"description" json:"description"`
 	Bindable    bool     `yaml:"bindable" json:"bindable"`
 	Tags        []string `yaml:"tags" json:"tags"`
@@ -150,6 +152,7 @@ func ReadPlans(dir string, service Service) ([]Plan, error) {
 				return pp, err
 			}
 			p.ID = service.ID + "-" + p.ID
+			p.Type = service.Type
 			p.Service = &service
 			pp = append(pp, p)
 		}