setting mesos attributes for agent nodes (#2853)

Azure · May 3, 2018 · c124009 · c124009
1 parent a10b9d9
commit c124009
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/parts/dcos/bstrap/dcoscustomdata111.t b/parts/dcos/bstrap/dcoscustomdata111.t
@@ -96,6 +96,10 @@ write_files:
   owner: root
   path: /opt/azure/dcos/diagnostics_fix.sh
   permissions: '0744'
+- path: /var/lib/dcos/mesos-slave-common
+  content: 'ATTRIBUTES_STR'
+  permissions: "0644"
+  owner: "root"
 - content: 'PROVISION_STR'
   path: /opt/azure/containers/provision.sh
   permissions: "0744"

diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go
@@ -2229,7 +2229,7 @@ func getDCOSAgentCustomNodeLabels(profile *api.AgentPoolProfile) string {
 	if len(profile.OSType) > 0 {
 		attrstring = fmt.Sprintf("MESOS_ATTRIBUTES=\"os:%s", profile.OSType)
 	} else {
-		attrstring = fmt.Sprintf("MESOS_ATTRIBUTES=\"os:linux")
+		attrstring = fmt.Sprintf("MESOS_ATTRIBUTES=\"os:%s", api.Linux)
 	}
 
 	if len(profile.Ports) > 0 {