summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-02 10:49:53 +0000
committerGerrit Code Review <review@openstack.org>2016-06-02 10:49:54 +0000
commit4d917d200a079902fc3676a1f10cd8af31b731bd (patch)
tree8cf77f573ee4fd203036c17941fe5a28ba16cbf8
parente5eb2605220589f89368e8f69cdf709de8e5bc63 (diff)
parentd4a8023d17f672f10e83e48fab4e97dc0796af76 (diff)
downloadhorizon-10.0.0.0b1.tar.gz
Merge "Set some useful default values with the new launch wizard."10.0.0.0b1
-rw-r--r--openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js15
1 files changed, 15 insertions, 0 deletions
diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
index 4922a1483..9bdd42a67 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
@@ -344,6 +344,9 @@
e.keypair.id = e.keypair.name;
return e.keypair;
}));
+ if (data.data.items.length === 1) {
+ model.newInstanceSpec.key_pair.push(data.data.items[0].keypair);
+ }
}
function setFinalSpecKeyPairs(finalSpec) {
@@ -361,6 +364,15 @@
function onGetSecurityGroups(data) {
model.securityGroups.length = 0;
+ angular.forEach(data.data.items, function addDefault(item) {
+ // 'default' is a special security group in neutron. It can not be
+ // deleted and is guaranteed to exist. It by default contains all
+ // of the rules needed for an instance to reach out to the network
+ // so the instance can provision itself.
+ if (item.name === 'default') {
+ model.newInstanceSpec.security_groups.push(item);
+ }
+ });
push.apply(model.securityGroups, data.data.items);
}
@@ -386,6 +398,9 @@
function onGetNetworks(data) {
model.neutronEnabled = true;
model.networks.length = 0;
+ if (data.data.items.length === 1) {
+ model.newInstanceSpec.networks.push(data.data.items[0]);
+ }
push.apply(model.networks, data.data.items);
return data;
}