From 4a7e1d41a5356f18b900986b06dccd968ab6b6a0 Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Wed, 27 Jan 2016 15:20:07 -0500
Subject: Fixes various bugs and adds some improvements

Changes Include:
 - Disables introspection.  We don't currently use introspection for
anything other than to just run it.  Disabling it to increase deploy
speed and reduce pxeboot issues.
 - Adds timeout to deploy of 90 minutes.  Default heat timeout is 3-4
hours.
 - Fixes OVS bridge attach/detach for users who use PREFIX in their
ifcfg instead of NETMASK
 - Adds nosdn deploy settings file, and allows nosdn deployments
 - Adds example inventory file to the docs dir

Change-Id: Ic13d6c4d5f27bac25365e5951acdd9bd3e641a15
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 config/deploy/os-nosdn-nofeature-ha.yaml   |  9 +++++++++
 config/inventory/pod_example_settings.yaml | 10 +++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 config/deploy/os-nosdn-nofeature-ha.yaml

(limited to 'config')

diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml
new file mode 100644
index 00000000..becd6e57
--- /dev/null
+++ b/config/deploy/os-nosdn-nofeature-ha.yaml
@@ -0,0 +1,9 @@
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  sdn_controller: false
+  sdn_l3: false
+  tacker: false
+  congress: false
+  sfc: false
diff --git a/config/inventory/pod_example_settings.yaml b/config/inventory/pod_example_settings.yaml
index 70fa50e7..55d8fb61 100644
--- a/config/inventory/pod_example_settings.yaml
+++ b/config/inventory/pod_example_settings.yaml
@@ -5,7 +5,7 @@ nodes:
     ipmi_user: root
     ipmi_pass: root
     cpus: 2
-    memory: 2048
+    memory: 8192
     disk: 40
     arch: "x86_64"
     capabilities: "profile:control"
@@ -15,7 +15,7 @@ nodes:
     ipmi_user: root
     ipmi_pass: root
     cpus: 2
-    memory: 2048
+    memory: 8192
     disk: 40
     arch: "x86_64"
     capabilities: "profile:control"
@@ -25,7 +25,7 @@ nodes:
     ipmi_user: root
     ipmi_pass: root
     cpus: 2
-    memory: 2048
+    memory: 8192
     disk: 40
     arch: "x86_64"
     capabilities: "profile:control"
@@ -35,7 +35,7 @@ nodes:
     ipmi_user: root
     ipmi_pass: root
     cpus: 2
-    memory: 2048
+    memory: 8192
     disk: 40
     arch: "x86_64"
     capabilities: "profile:compute"
@@ -45,7 +45,7 @@ nodes:
     ipmi_user: root
     ipmi_pass: root
     cpus: 2
-    memory: 2048
+    memory: 8192
     disk: 40
     arch: "x86_64"
     capabilities: "profile:compute"
-- 
cgit 1.2.3-korg