add server/ES combined role
update chef