summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-01-27 15:20:07 -0500
committerTim Rozet <trozet@redhat.com>2016-01-27 21:37:20 -0500
commit4a7e1d41a5356f18b900986b06dccd968ab6b6a0 (patch)
tree43e31f987a06de32e5213836e93e8c94647ee4ad /config
parentcc5578d53c28b80a3a1449b036b714c8647c11ae (diff)
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>
Diffstat (limited to 'config')
-rw-r--r--config/deploy/os-nosdn-nofeature-ha.yaml9
-rw-r--r--config/inventory/pod_example_settings.yaml10
2 files changed, 14 insertions, 5 deletions
diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml
new file mode 100644
index 0000000..becd6e5
--- /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 70fa50e..55d8fb6 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"