X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=overcloud-without-mergepy.yaml;h=9c915c4a5f95290286af5d3962df564dc9216ea6;hb=9ea7831eaeadced1b5599b6ef1feb01d0cb6dca2;hp=4a47efbc604c1418ff8e70573a835fa014d6aaeb;hpb=954491c442cbc34ec0a17086d4e90247437b1712;p=apex-tripleo-heat-templates.git

diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 4a47efbc..9c915c4a 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -1,8 +1,10 @@
 heat_template_version: 2015-04-30
 
 description: >
-  Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL
-  server,Dedicated RabbitMQ Server,Group of Nova Computes
+  Deploy an OpenStack environment, consisting of several node types (roles),
+  Controller, Compute, BlockStorage, SwiftStorage and CephStorage.  The Storage
+  roles enable independent scaling of the storage components, but the minimal
+  deployment is one Controller and one Compute node.
 
 
 # TODO(shadower): we should probably use the parameter groups to put
@@ -61,6 +63,10 @@ parameters:
     default: true
     description: Whether to enable or not the Iscsi backend for Cinder
     type: boolean
+  CinderEnableRbdBackend:
+    default: false
+    description: Whether to enable or not the Rbd backend for Cinder
+    type: boolean
   CloudName:
     default: ''
     description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
@@ -114,9 +120,9 @@ parameters:
     type: string
     default: "datacentre:br-ex"
   NeutronControlPlaneID:
-    default: ''
+    default: 'ctlplane'
     type: string
-    description: Neutron ID for ctlplane network.
+    description: Neutron ID or name for ctlplane network.
   NeutronEnableTunnelling:
     type: string
     default: "True"
@@ -282,10 +288,6 @@ parameters:
     description: The keystone auth secret.
     type: string
     hidden: true
-  CinderEnableRbdBackend:
-    default: false
-    description: Whether to enable or not the Rbd backend for Cinder
-    type: boolean
   CinderLVMLoopDeviceSize:
     default: 5000
     description: The size of the loopback file used by the cinder LVM driver.
@@ -314,6 +316,8 @@ parameters:
   ControllerCount:
     type: number
     default: 1
+    constraints:
+      - range: {min: 1}
   controllerExtraConfig:
     default: {}
     description: |
@@ -895,6 +899,7 @@ resources:
           CeilometerMeteringSecret: {get_param: CeilometerMeteringSecret}
           CeilometerPassword: {get_param: CeilometerPassword}
           CinderEnableNfsBackend: {get_param: CinderEnableNfsBackend}
+          CinderEnableRbdBackend: {get_param: CinderEnableRbdBackend}
           Debug: {get_param: Debug}
           ExtraConfig: {get_param: ExtraConfig}
           Flavor: {get_param: OvercloudComputeFlavor}
@@ -1102,7 +1107,7 @@ resources:
     depends_on: Networks
     properties:
       name: control_virtual_ip
-      network_id: {get_param: NeutronControlPlaneID}
+      network: {get_param: NeutronControlPlaneID}
       fixed_ips: {get_param: ControlFixedIPs}
       replacement_policy: AUTO