From 860ee67af1142592ba414eb2833d39e2fcefdcfc Mon Sep 17 00:00:00 2001
From: Vincent Fiduccia <vincent@rancher.com>
Date: Wed, 7 Feb 2018 18:15:27 -0700
Subject: [PATCH] Set requestedhostname on ssh

---
 lib/shared/addon/mixins/host-driver.js | 3 ++-
 package.json                           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/shared/addon/mixins/host-driver.js b/lib/shared/addon/mixins/host-driver.js
index fccfe1f2d..ce981328a 100644
--- a/lib/shared/addon/mixins/host-driver.js
+++ b/lib/shared/addon/mixins/host-driver.js
@@ -228,6 +228,7 @@ export default Mixin.create(NewOrEdit, ManageLabels, {
     if ( type === 'machinetemplate' ) {
       return this._super(...arguments);
     } else if ( type === 'machine'  && !passBack ) {
+      set(this, 'primaryResource.requestedHostname', get(this,'prefix'));
       set(this, 'primaryResource.clusterId', get(this, 'requestedClusterId'));
       return this._super(...arguments);
     } else {
@@ -277,7 +278,7 @@ export default Mixin.create(NewOrEdit, ManageLabels, {
     } else if ( type === 'machineconfig' && passBack ) {
       const pr = get(this, 'primaryResource');
       set(pr, 'requestedHostname', get(this,'prefix'));
-      return [get(this,'primaryResource')];
+      return [pr];
     } else {
       if (passBack) {
         tpl = get(this, 'globalStore').createRecord({
diff --git a/package.json b/package.json
index 5e4be879b..2bd044dc8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "2.0.18",
+  "version": "2.0.19",
   "private": true,
   "directories": {
     "doc": "doc",