Merge pull request #50 from hpcloud/marky-release-name

HCF-329: Generate spec store with BOSH releases as directories.

README.md

@@ -223,7 +223,7 @@ The following configuration stores are required:
 - The descriptions for all keys: `/<prefix>/descriptions/<key-path>/`
 
 - Default sets
- - The default values from the job specs, per job: `/<prefix>/spec/R-<release-name>-J-<job-name>/<key-path>/`
+ - The default values from the job specs, per job: `/<prefix>/spec/<release-name>/<job-name>/<key-path>/`
  - Opinions retrieved from generated manifest files: `/<prefix>/opinions/<key-path>/`
 
 - User sets

config-store/config_store.go

@@ -78,7 +78,7 @@ func (c *Builder) writeSpecConfigs(release *model.Release, confWriter configWrit
 
 	for _, job := range release.Jobs {
 		for _, property := range job.Properties {
-			key, err := c.boshKeyToConsulPath(fmt.Sprintf("R-%s-J-%s.%s", release.Name, job.Name, property.Name), SpecStore)
+			key, err := c.boshKeyToConsulPath(fmt.Sprintf("%s.%s.%s", release.Name, job.Name, property.Name), SpecStore)
 			if err != nil {
 				return err
 			}

scripts/dockerfiles/run.sh

@@ -43,7 +43,8 @@ ip_address=`/bin/hostname -i`
   --consul  "${consul_address}" \
   --prefix  "${config_store_prefix}" \
   --role    "{{$role.Name}}" \
-  --job     "R-{{$job.Release.Name}}-J-{{$job.Name}}" \
+  --release "{{$job.Release.Name}}" \
+  --job     "{{$job.Name}}" \
   "/var/vcap/jobs-src/{{ $job.Name }}/templates/{{ $template.SourcePath }}"
 # =====================================================
 {{ end }}
@@ -57,7 +58,8 @@ ip_address=`/bin/hostname -i`
   --consul  "${consul_address}" \
   --prefix  "${config_store_prefix}" \
   --role    "{{$role.Name}}" \
-  --job     "R-{{$job.Release.Name}}-J-{{$job.Name}}" \
+  --release "{{$job.Release.Name}}" \
+  --job     "{{$job.Name}}" \
   "/var/vcap/jobs-src/{{ $job.Name }}/monit"
 # =====================================================
 {{ end }}
@@ -71,6 +73,7 @@ ip_address=`/bin/hostname -i`
   --consul  "${consul_address}" \
   --prefix  "${config_store_prefix}" \
   --role    "{{$role.Name}}" \
+  --release "{{with $l := index $role.JobNameList 0}}{{$l.ReleaseName}}{{end}}" \
   --job     "hcf-monit-master" \
   "/opt/hcf/monitrc.erb"
 chmod 0600 /etc/monitrc