Merge branch 'develop'

2018-01-19 09:24:39 +01:00 · 2018-01-19 09:24:39 +01:00 · b4d14d0a1f
commit b4d14d0a1f
parent c82d771d2e 646e02ca9c
2 changed files with 7 additions and 16 deletions
--- a/21
+++ b/21
@ -1,5 +1,9 @@
+# A demo cluster of three nodes.
+
 [databases]
+openstack01-node01
 openstack01-node02
+openstack01-node03

 [keystone]
 openstack01-node03
@ -15,24 +19,9 @@ openstack01-node01
 openstack01-node02
 openstack01-node03

-#[cassandra]
-#openstack01-node[01:03]
-
-#openstack01-node01
-#
-#[next_cassandra]
-#openstack01-node02
-#openstack01-node03
-
 [memcached]
 openstack01-node03

-#[first_cassandra:vars]
-#run_options=""
-#
-#[next_cassandra:vars]
-#run_options="-e CASSANDRA_SEEDS=172.23.41.1"
-
 [neutron-controller]
 openstack01-node01 physical_interface_mappings=provider:ens192

@ -46,4 +35,4 @@ openstack01-node03
 openstack01-node01 storage_volume=/dev/loop0

 [nova-compute]
-openstack01-node04 physical_interface_mappings=provider:dummy0
+openstack01-node04 physical_interface_mappings=provider:enp4s0f0
--- a/2
+++ b/2
@ -1,3 +1,5 @@
+# An all in one
+
 [databases]
 os-test