aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-10-23 23:46:44 +0000
committerGerrit Code Review <review@openstack.org>2013-10-23 23:46:44 +0000
commit4671819e7e89fa320e1a2967410af044bdd1252e (patch)
treef08fd32001c0c31d6288f624d2dc30e58919aea0
parentfff9c57ac660db407c70c989a23dc0fa395bce07 (diff)
parent445dda586391c1c9d293f55f216596889066a8a0 (diff)
Merge "Disable nova bm file injection in undercloud"
-rw-r--r--undercloud-bm.yaml1
-rw-r--r--undercloud-vm.yaml1
2 files changed, 2 insertions, 0 deletions
diff --git a/undercloud-bm.yaml b/undercloud-bm.yaml
index 181a58e2..cfc6f4ff 100644
--- a/undercloud-bm.yaml
+++ b/undercloud-bm.yaml
@@ -152,6 +152,7 @@ Resources:
ram_allocation_ratio: 1.0
reserved_host_memory_mb: 0
baremetal:
+ use_file_injection: "False"
arch:
Ref: BaremetalArch
db: mysql://nova:unset@localhost/nova_bm
diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index 4e09e773..e8502a57 100644
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -157,6 +157,7 @@ Resources:
ram_allocation_ratio: 1.0
reserved_host_memory_mb: 0
baremetal:
+ use_file_injection: "False"
arch:
Ref: BaremetalArch
db: mysql://nova:unset@localhost/nova_bm