From 6eb5515b00dc21bfe0c67435ce1da9cdc94b9b79 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 28 Mar 2019 18:17:12 -0600 Subject: [PATCH] Switch to topology_map We would like to remove the --*-scale options from the cli so we need to be able to configure the OvercloudCount 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 | 5 +++-- config/nodes/1ctlr_1comp_1ceph.yml | 5 +++-- config/nodes/1ctlr_2comp_1supp.yml | 5 +++-- config/nodes/2ctlr.yml | 9 +++++++-- config/nodes/3ctlr_1comp.yml | 8 +++++--- config/nodes/3ctlr_1comp_192gb.yml | 8 +++++--- config/nodes/3ctlr_1comp_1supp.yml | 8 +++++--- config/nodes/3ctlr_1comp_64gb.yml | 8 +++++--- config/nodes/3ctlr_2comp_3ceph.yml | 11 +++++++---- config/nodes/3ctlr_3comp.yml | 8 +++++--- config/nodes/baremetal_3ctlr_1comp.yml | 8 +++++--- 11 files changed, 53 insertions(+), 30 deletions(-) diff --git a/config/nodes/1ctlr.yml b/config/nodes/1ctlr.yml index c744d1792..c1afa915b 100644 --- a/config/nodes/1ctlr.yml +++ b/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: >- - --compute-scale 0 +topology_map: + Compute: + scale: 0 diff --git a/config/nodes/1ctlr_1comp_1ceph.yml b/config/nodes/1ctlr_1comp_1ceph.yml index 7cf35411e..de6bec82c 100644 --- a/config/nodes/1ctlr_1comp_1ceph.yml +++ b/config/nodes/1ctlr_1comp_1ceph.yml @@ -17,8 +17,9 @@ overcloud_nodes: node_count: 3 # Tell tripleo which nodes to deploy. -topology: >- - --ceph-storage-scale 1 +topology_map: + CephStorage: + scale: 1 network_isolation: true network_isolation_type: 'single-nic-vlans' diff --git a/config/nodes/1ctlr_2comp_1supp.yml b/config/nodes/1ctlr_2comp_1supp.yml index 5a191cd7d..4ee9fb035 100644 --- a/config/nodes/1ctlr_2comp_1supp.yml +++ b/config/nodes/1ctlr_2comp_1supp.yml @@ -23,5 +23,6 @@ supplemental_node: name: ipa flavor: undercloud -topology: >- - --compute-scale 2 +topology_map: + Compute: + scale: 2 diff --git a/config/nodes/2ctlr.yml b/config/nodes/2ctlr.yml index f824eeb4d..fe9c8849a 100644 --- a/config/nodes/2ctlr.yml +++ b/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: >- - --compute-scale 0 +topology_map: + Controller: + scale: 1 + ControllerApi: + scale: 1 + Compute: + scale: 0 diff --git a/config/nodes/3ctlr_1comp.yml b/config/nodes/3ctlr_1comp.yml index adca58fa8..9551abacd 100644 --- a/config/nodes/3ctlr_1comp.yml +++ b/config/nodes/3ctlr_1comp.yml @@ -37,6 +37,8 @@ overcloud_nodes: virtualbmc_port: 6233 # Tell tripleo which nodes to deploy. -topology: >- - --compute-scale 1 - --control-scale 3 +topology_map: + Controller: + scale: 3 + Compute: + scale: 1 diff --git a/config/nodes/3ctlr_1comp_192gb.yml b/config/nodes/3ctlr_1comp_192gb.yml index 178779fd2..021fcd826 100644 --- a/config/nodes/3ctlr_1comp_192gb.yml +++ b/config/nodes/3ctlr_1comp_192gb.yml @@ -37,6 +37,8 @@ overcloud_nodes: virtualbmc_port: 6233 # Tell tripleo which nodes to deploy. -topology: >- - --compute-scale 1 - --control-scale 3 +topology_map: + Controller: + scale: 3 + Compute: + scale: 1 diff --git a/config/nodes/3ctlr_1comp_1supp.yml b/config/nodes/3ctlr_1comp_1supp.yml index f7c021e81..3a31e4d57 100644 --- a/config/nodes/3ctlr_1comp_1supp.yml +++ b/config/nodes/3ctlr_1comp_1supp.yml @@ -26,6 +26,8 @@ supplemental_node: name: ipa flavor: undercloud -topology: >- - --compute-scale 1 - --control-scale 3 +topology_map: + Controller: + scale: 3 + Compute: + scale: 1 diff --git a/config/nodes/3ctlr_1comp_64gb.yml b/config/nodes/3ctlr_1comp_64gb.yml index f0578648f..d3217c66c 100644 --- a/config/nodes/3ctlr_1comp_64gb.yml +++ b/config/nodes/3ctlr_1comp_64gb.yml @@ -38,6 +38,8 @@ overcloud_nodes: virtualbmc_port: 6233 # Tell tripleo which nodes to deploy. -topology: >- - --compute-scale 1 - --control-scale 3 +topology_map: + Controller: + scale: 3 + Compute: + scale: 1 diff --git a/config/nodes/3ctlr_2comp_3ceph.yml b/config/nodes/3ctlr_2comp_3ceph.yml index 9faf01341..10c23ec61 100644 --- a/config/nodes/3ctlr_2comp_3ceph.yml +++ b/config/nodes/3ctlr_2comp_3ceph.yml @@ -54,7 +54,10 @@ overcloud_nodes: node_count: 8 -topology: >- - --compute-scale 2 - --control-scale 3 - --ceph-storage-scale 3 +topology_map: + Controller: + scale: 3 + Compute: + scale: 2 + CephStorage: + scale: 3 diff --git a/config/nodes/3ctlr_3comp.yml b/config/nodes/3ctlr_3comp.yml index dedaa0660..dd8b42136 100644 --- a/config/nodes/3ctlr_3comp.yml +++ b/config/nodes/3ctlr_3comp.yml @@ -47,6 +47,8 @@ node_count: 6 network_isolation: true network_isolation_type: 'single-nic-vlans' -topology: >- - --compute-scale 3 - --control-scale 3 +topology_map: + Controller: + scale: 3 + Compute: + scale: 3 diff --git a/config/nodes/baremetal_3ctlr_1comp.yml b/config/nodes/baremetal_3ctlr_1comp.yml index 52b1c60b3..ee495cad6 100644 --- a/config/nodes/baremetal_3ctlr_1comp.yml +++ b/config/nodes/baremetal_3ctlr_1comp.yml @@ -5,6 +5,8 @@ overcloud_nodes: # Tell tripleo which nodes to deploy. -topology: >- - --compute-scale 1 - --control-scale 3 +topology_map: + Controller: + scale: 3 + Compute: + scale: 1