summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-01-28 15:59:51 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-28 15:59:51 +0000
commit86b63487620e56978242572a5cf59c4f535a7d98 (patch)
tree2cac30f97b0e4d55ff813f2c95ea7bd812f7e7bb /config
parent1c337aef12c7a026eee2020017f8433c71808433 (diff)
parent4a7e1d41a5356f18b900986b06dccd968ab6b6a0 (diff)
Merge "Fixes various bugs and adds some improvements"
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 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"