Switch to topology_map

We would like to remove the --*-scale options from the cli so we need to
be able to configure the Overcloud<role>Count options instead. This
change switches from using topology to topology_map to express the
topology configuration.

Change-Id: Ifff664d8f75bd29fa764ef0cdf780627f648e689
Depends-On: https://review.openstack.org/#/c/648562/

config/nodes/1ctlr.yml

@@ -11,5 +11,6 @@ deployed_server_overcloud_roles:
   - name: Controller
     hosts: "$(sed -n 1,1p /etc/nodepool/sub_nodes_private)"
 
-topology: >-
+topology_map:
-  --compute-scale 0
+  Compute:
+    scale: 0

config/nodes/1ctlr_1comp_1ceph.yml

@@ -17,8 +17,9 @@ overcloud_nodes:
 node_count: 3
 
 # Tell tripleo which nodes to deploy.
-topology: >-
+topology_map:
-  --ceph-storage-scale 1
+  CephStorage:
+    scale: 1
 
 network_isolation: true
 network_isolation_type: 'single-nic-vlans'

config/nodes/1ctlr_2comp_1supp.yml

@@ -23,5 +23,6 @@ supplemental_node:
   name: ipa
   flavor: undercloud
 
-topology: >-
+topology_map:
-  --compute-scale 2
+  Compute:
+    scale: 2

config/nodes/2ctlr.yml

@@ -17,5 +17,10 @@ deployed_server_overcloud_roles:
   - name: Controller
     hosts: "$(sed -n 2,2p /etc/nodepool/sub_nodes_private)"
 
-topology: >-
+topology_map:
-  --compute-scale 0
+  Controller:
+    scale: 1
+  ControllerApi:
+    scale: 1
+  Compute:
+    scale: 0

config/nodes/3ctlr_1comp.yml

@@ -37,6 +37,8 @@ overcloud_nodes:
     virtualbmc_port: 6233
 
 # Tell tripleo which nodes to deploy.
-topology: >-
+topology_map:
-  --compute-scale 1
+  Controller:
-  --control-scale 3
+    scale: 3
+  Compute:
+    scale: 1

config/nodes/3ctlr_1comp_192gb.yml

@@ -37,6 +37,8 @@ overcloud_nodes:
     virtualbmc_port: 6233
 
 # Tell tripleo which nodes to deploy.
-topology: >-
+topology_map:
-  --compute-scale 1
+  Controller:
-  --control-scale 3
+    scale: 3
+  Compute:
+    scale: 1

config/nodes/3ctlr_1comp_1supp.yml

@@ -26,6 +26,8 @@ supplemental_node:
   name: ipa
   flavor: undercloud
 
-topology: >-
+topology_map:
-  --compute-scale 1
+  Controller:
-  --control-scale 3
+    scale: 3
+  Compute:
+    scale: 1

config/nodes/3ctlr_1comp_64gb.yml

@@ -38,6 +38,8 @@ overcloud_nodes:
     virtualbmc_port: 6233
 
 # Tell tripleo which nodes to deploy.
-topology: >-
+topology_map:
-  --compute-scale 1
+  Controller:
-  --control-scale 3
+    scale: 3
+  Compute:
+    scale: 1

config/nodes/3ctlr_2comp_3ceph.yml

@@ -54,7 +54,10 @@ overcloud_nodes:
 
 node_count: 8
 
-topology: >-
+topology_map:
-  --compute-scale 2
+  Controller:
-  --control-scale 3
+    scale: 3
-  --ceph-storage-scale 3
+  Compute:
+    scale: 2
+  CephStorage:
+    scale: 3

config/nodes/3ctlr_3comp.yml

@@ -47,6 +47,8 @@ node_count: 6
 
 network_isolation: true
 network_isolation_type: 'single-nic-vlans'
-topology: >-
+topology_map:
-  --compute-scale 3
+  Controller:
-  --control-scale 3
+    scale: 3
+  Compute:
+    scale: 3

config/nodes/baremetal_3ctlr_1comp.yml

@@ -5,6 +5,8 @@
 overcloud_nodes:
 
 # Tell tripleo which nodes to deploy.
-topology: >-
+topology_map:
-  --compute-scale 1
+  Controller:
-  --control-scale 3
+    scale: 3
+  Compute:
+    scale: 1