rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix host label fields (rancher/rancher#1461), s/project/stack label (rancher/rancher#1483)

This commit is contained in:
Vincent Fiduccia 2015-07-13 12:05:02 -07:00
parent 6e83c47b92
commit d93dcb0c45
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.watchmanconfig
View File

@ -1,4 +1,4 @@
{
"ignore_dirs": ["tmp"]
"ignore_dirs": ["tmp"],
"fsevents_latency": 0.1
}

5
app/mixins/edit-labels.js
View File

@ -15,6 +15,11 @@ export default Ember.Mixin.create({
},
addSystemLabel: function(key, value, type) {
if ( !key )
{
key = C.LABEL.SCHED_HOST_LABEL;
}
if ( !type )
{
type = ((key||'').indexOf(C.LABEL.SCHED_AFFINITY) === 0 ? 'affinity' : 'system');

4
app/utils/constants.js
View File

@ -70,8 +70,8 @@ var C = {
LABEL: {
SYSTEM_PREFIX: 'io.rancher.',
SERVICE_NAME: 'io.rancher.project_service.name',
PROJECT_NAME: 'io.rancher.project.name',
SERVICE_NAME: 'io.rancher.stack_service.name',
PROJECT_NAME: 'io.rancher.stack.name',
SCHED_GLOBAL: 'io.rancher.scheduler.global',
SCHED_AFFINITY: 'io.rancher.scheduler.affinity:',
SCHED_CONTAINER: 'io.rancher.scheduler.affinity:container',