@@ -26,11 +26,20 @@
{{#if isMachine}}
-
{{#if isActive}}
+
Waiting for host to check in…
{{else}}
- Setting up machine…
+ {{#if model.isError}}
+ {{#if model.transitioningMessage}}
+
{{model.transitioningMessage}}
+ {{else}}
+
Error creating machine
+ {{/if}}
+ {{else}}
+
Setting up machine…
+ {{model.transitioningMessage}}
+ {{/if}}
{{/if}}
{{else}}
diff --git a/app/pods/hosts/new/digitalocean/digitalocean_regions.js b/app/pods/hosts/new/digitalocean/digitalocean_regions.js
index 4beb0fefc..338ef9872 100644
--- a/app/pods/hosts/new/digitalocean/digitalocean_regions.js
+++ b/app/pods/hosts/new/digitalocean/digitalocean_regions.js
@@ -34,7 +34,6 @@ export default {
"1gb",
"4gb",
"8gb",
- "512mb",
"64gb",
"48gb"
],
@@ -55,7 +54,6 @@ export default {
"1gb",
"4gb",
"8gb",
- "512mb",
"64gb",
"48gb"
],
@@ -78,7 +76,6 @@ export default {
"1gb",
"4gb",
"8gb",
- "512mb",
"64gb",
"48gb"
],
@@ -101,7 +98,6 @@ export default {
"1gb",
"4gb",
"8gb",
- "512mb",
"64gb",
"48gb"
],
diff --git a/app/pods/hosts/new/digitalocean/route.js b/app/pods/hosts/new/digitalocean/route.js
index bc2da0930..78973e66c 100644
--- a/app/pods/hosts/new/digitalocean/route.js
+++ b/app/pods/hosts/new/digitalocean/route.js
@@ -11,7 +11,7 @@ export default Ember.Route.extend({
var config = store.createRecord({
type: 'digitaloceanConfig',
accessToken: '',
- size: '512mb',
+ size: '1gb',
region: 'nyc3',
image: 'ubuntu-14-04-x64'
});
diff --git a/app/styles/host.scss b/app/styles/host.scss
index 70288f85d..149d868a0 100644
--- a/app/styles/host.scss
+++ b/app/styles/host.scss
@@ -98,7 +98,7 @@ $instance_action: #ededed;
.host-info {
padding: 5px;
text-align: center;
- border-bottom: 1px solid #f9fafc;
+ border-bottom: 1px solid $host_border;
.host-info-item {
margin-top: 5px;
@@ -148,7 +148,8 @@ $instance_action: #ededed;
.machine-info {
vertical-align: middle;
text-align: center;
- line-height: 90px;
+ padding: 10px;
+ white-space: normal;
color: #d2d7de;
}
}
diff --git a/app/utils/cattle.js b/app/utils/cattle.js
index 031793cf8..6d6334e09 100644
--- a/app/utils/cattle.js
+++ b/app/utils/cattle.js
@@ -123,6 +123,7 @@ var TransitioningResource = Resource.extend({
transitioningMessage: null,
transitioningProgress: null,
isTransitioning: Ember.computed.equal('transitioning','yes'),
+ isError: Ember.computed.equal('transitioning','error'),
replaceWith: function() {
this._super.apply(this,arguments);
@@ -193,8 +194,6 @@ var TransitioningResourceController = ResourceController.extend({
return state.substr(0,1).toUpperCase() + state.substr(1);
}.property('state'),
- isError: Ember.computed.equal('transitioning','error'),
-
showTransitioningMessage: function() {
var trans = this.get('transitioning');
return (trans === 'yes' || trans === 'error') && (this.get('transitioningMessage')||'').length > 0;