Added the option to use Ceph for Nova ephemeral.
Changed the live_migration_flags to Ceph reccomended if being used
Hardcoded Nova to talk to Cinder internalURL
Added option for setting Nova-console keymap
Change-Id: If0d3104c1ad5a76315a72f7fc7d7b79b9e87ae52
diff --git a/tests/pillar/compute_cluster.sls b/tests/pillar/compute_cluster.sls
index bbfb87c..d4085e1 100644
--- a/tests/pillar/compute_cluster.sls
+++ b/tests/pillar/compute_cluster.sls
@@ -5,6 +5,7 @@
virtualization: kvm
heal_instance_info_cache_interval: 60
vncproxy_url: openstack:6080
+ vnc_keymap: en-gb
bind:
vnc_address: 127.0.0.1
vnc_port: 6080
diff --git a/tests/pillar/compute_single.sls b/tests/pillar/compute_single.sls
index fa22905..b7bb345 100644
--- a/tests/pillar/compute_single.sls
+++ b/tests/pillar/compute_single.sls
@@ -5,6 +5,7 @@
virtualization: kvm
heal_instance_info_cache_interval: 60
vncproxy_url: openstack:6080
+ vnc_keymap: en-gb
bind:
vnc_address: 127.0.0.1
vnc_port: 6080
diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index 5ee0ab2..f680154 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -4,6 +4,7 @@
networking: default
version: liberty
vncproxy_url: 127.0.0.1
+ vnc_keymap: en-gb
security_group: false
dhcp_domain: novalocal
scheduler_default_filters: "DifferentHostFilter,RetryFilter,AvailabilityZoneFilter,RamFilter,CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter"
diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index 8a06a7d..fb1bbf0 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -5,6 +5,7 @@
version: liberty
security_group: false
vncproxy_url: 127.0.0.1
+ vnc_keymap: en-gb
dhcp_domain: novalocal
scheduler_default_filters: "DifferentHostFilter,RetryFilter,AvailabilityZoneFilter,RamFilter,CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter"
cpu_allocation_ratio: 16.0