aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Laughlin <clark.laughlin@linaro.org>2015-04-15 10:58:23 +0000
committerClark Laughlin <clark.laughlin@linaro.org>2015-04-15 10:58:23 +0000
commitbe609c4c9399790ad09d5bb58ac5fb48846825fb (patch)
tree7c6643aa755fc61946ff3dbdcebaab11039c0a38
parent65de60875c35ac427d3637abeecfae7d8e94165c (diff)
single unified config for arm64 and amd64
-rw-r--r--cloud-deploy/openstack-config.yaml7
1 files changed, 3 insertions, 4 deletions
diff --git a/cloud-deploy/openstack-config.yaml b/cloud-deploy/openstack-config.yaml
index d604c4b..65dbd8d 100644
--- a/cloud-deploy/openstack-config.yaml
+++ b/cloud-deploy/openstack-config.yaml
@@ -29,8 +29,7 @@ nova-compute:
# nova will setup iptables rules to NAT the traffic directed to the assigned
# floating ip address to this interface
- # ARM: config-flags: 'vnc_enabled=False,libvirt_disk_prefix=vd,libvirt_use_virtio_for_bridges=False,public_interface=juju-br0'
- config-flags: 'public_interface=juju-br0'
+ config-flags: 'vnc_enabled=False,public_interface=juju-br0'
# flat-interface needs to be set to the interface that openstack-internal traffic
# is to go over. This is the interface on the node running nova-compute that will
@@ -40,8 +39,8 @@ nova-compute:
# set to 'yes' to make nova-network run on the same node as nova-compute
multi-host: 'yes'
- enable-live-migration: 'True'
+ enable-live-migration: 'False'
migration-auth-type: "none"
virt-type: kvm
- enable-resize: 'True'
+ enable-resize: 'False'