X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=overcloud.yaml;h=077ffacc718ca1300c9aec3b0fb815882ef1e947;hb=c2c8f0f39ad0c9c7d7e1f5a7d63de9ad019519c0;hp=aeb1c1bbd213f47347c0bd5a3fdeeed701957ecc;hpb=46e85eaa013dc9fa5a3467f18021b346ac18a635;p=apex-tripleo-heat-templates.git

diff --git a/overcloud.yaml b/overcloud.yaml
index aeb1c1bb..077ffacc 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -149,8 +149,6 @@ parameters:
   ControllerCount:
     type: number
     default: 1
-    constraints:
-      - range: {min: 1}
   controllerExtraConfig:
     default: {}
     description: |
@@ -257,18 +255,6 @@ parameters:
     description: A random string to be used as a salt when hashing to determine mappings in the ring.
     type: string
     hidden: true
-  SwiftMinPartHours:
-    type: number
-    default: 1
-    description: The minimum time (in hours) before a partition in a ring can be moved following a rebalance.
-  SwiftPartPower:
-    default: 10
-    description: Partition Power to use when building Swift rings
-    type: number
-  SwiftReplicas:
-    type: number
-    default: 3
-    description: How many replicas to use in the swift rings.
 
 # Compute-specific params
   ComputeCount:
@@ -373,6 +359,7 @@ parameters:
       - OS::TripleO::Services::CinderApi
       - OS::TripleO::Services::CinderScheduler
       - OS::TripleO::Services::CinderVolume
+      - OS::TripleO::Services::Core
       - OS::TripleO::Services::Kernel
       - OS::TripleO::Services::Keystone
       - OS::TripleO::Services::GlanceApi
@@ -403,6 +390,7 @@ parameters:
       - OS::TripleO::Services::Ntp
       - OS::TripleO::Services::SwiftProxy
       - OS::TripleO::Services::SwiftStorage
+      - OS::TripleO::Services::SwiftRingBuilder
       - OS::TripleO::Services::Snmp
       - OS::TripleO::Services::Timezone
       - OS::TripleO::Services::CeilometerApi
@@ -501,6 +489,7 @@ parameters:
       - OS::TripleO::Services::Kernel
       - OS::TripleO::Services::Ntp
       - OS::TripleO::Services::SwiftStorage
+      - OS::TripleO::Services::SwiftRingBuilder
       - OS::TripleO::Services::Snmp
       - OS::TripleO::Services::Timezone
     description: A list of service resources (configured in the Heat
@@ -717,9 +706,6 @@ resources:
           RedisVirtualIP: {get_attr: [RedisVirtualIP, ip_address]}
           RedisVirtualIPUri: {get_attr: [RedisVirtualIP, ip_address_uri]}
           SwiftHashSuffix: {get_param: SwiftHashSuffix}
-          SwiftMinPartHours: {get_param: SwiftMinPartHours}
-          SwiftPartPower: {get_param: SwiftPartPower}
-          SwiftReplicas: { get_param: SwiftReplicas}
           ServiceNetMap: {get_param: ServiceNetMap}
           EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
           MysqlVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, MysqlNetwork]}]}
@@ -733,6 +719,7 @@ resources:
           ServerMetadata: {get_param: ServerMetadata}
           SchedulerHints: {get_param: ControllerSchedulerHints}
           ServiceConfigSettings: {get_attr: [ControllerServiceChain, role_data, config_settings]}
+          ServiceNames: {get_attr: [ControllerServiceChain, role_data, service_names]}
 
   ComputeServiceChain:
 
@@ -795,6 +782,7 @@ resources:
           SchedulerHints: {get_param: NovaComputeSchedulerHints}
           NodeIndex: '%index%'
           ServiceConfigSettings: {get_attr: [ComputeServiceChain, role_data, config_settings]}
+          ServiceNames: {get_attr: [ComputeServiceChain, role_data, service_names]}
 
   BlockStorageServiceChain:
     type: OS::TripleO::Services
@@ -828,6 +816,7 @@ resources:
           SchedulerHints: {get_param: BlockStorageSchedulerHints}
           NodeIndex: '%index%'
           ServiceConfigSettings: {get_attr: [BlockStorageServiceChain, role_data, config_settings]}
+          ServiceNames: {get_attr: [BlockStorageServiceChain, role_data, service_names]}
 
   ObjectStorageServiceChain:
     type: OS::TripleO::Services
@@ -847,10 +836,7 @@ resources:
           KeyName: {get_param: KeyName}
           Flavor: {get_param: OvercloudSwiftStorageFlavor}
           HashSuffix: {get_param: SwiftHashSuffix}
-          MinPartHours: {get_param: SwiftMinPartHours}
-          PartPower: {get_param: SwiftPartPower}
           Image: {get_param: SwiftStorageImage}
-          Replicas: { get_param: SwiftReplicas}
           UpdateIdentifier: {get_param: UpdateIdentifier}
           ServiceNetMap: {get_param: ServiceNetMap}
           Hostname:
@@ -865,6 +851,7 @@ resources:
           SchedulerHints: {get_param: ObjectStorageSchedulerHints}
           NodeIndex: '%index%'
           ServiceConfigSettings: {get_attr: [ObjectStorageServiceChain, role_data, config_settings]}
+          ServiceNames: {get_attr: [ObjectStorageServiceChain, role_data, service_names]}
 
   CephStorageServiceChain:
     type: OS::TripleO::Services
@@ -898,6 +885,7 @@ resources:
           SchedulerHints: {get_param: CephStorageSchedulerHints}
           NodeIndex: '%index%'
           ServiceConfigSettings: {get_attr: [CephStorageServiceChain, role_data, config_settings]}
+          ServiceNames: {get_attr: [CephStorageServiceChain, role_data, service_names]}
 
   ControllerIpListMap:
     type: OS::TripleO::Network::Ports::NetIpListMap
@@ -1091,30 +1079,6 @@ resources:
       object_store_swift_devices: {get_attr: [ObjectStorage, swift_device]}
       controller_swift_proxy_memcaches: {get_attr: [Controller, swift_proxy_memcache]}
 
-  ComputeCephDeployment:
-    type: OS::Heat::StructuredDeployments
-    properties:
-      name: ComputeCephDeployment
-      config: {get_attr: [CephClusterConfig, config_id]}
-      servers: {get_attr: [Compute, attributes, nova_server_resource]}
-
-  ControllerCephDeployment:
-    type: OS::Heat::StructuredDeployments
-    properties:
-      name: ControllerCephDeployment
-      config: {get_attr: [CephClusterConfig, config_id]}
-      servers: {get_attr: [Controller, attributes, nova_server_resource]}
-
-  CephStorageCephDeployment:
-    type: OS::Heat::StructuredDeployments
-    properties:
-      name: CephStorageCephDeployment
-      config: {get_attr: [CephClusterConfig, config_id]}
-      servers: {get_attr: [CephStorage, attributes, nova_server_resource]}
-
-  CephClusterConfig:
-    type: OS::TripleO::CephClusterConfig::SoftwareConfig
-
   ControllerAllNodesDeployment:
     type: OS::Heat::StructuredDeployments
     properties:
@@ -1251,14 +1215,14 @@ resources:
   # Nested stack deployment runs after all other controller deployments
   ControllerNodesPostDeployment:
     type: OS::TripleO::ControllerPostDeployment
-    depends_on: [ControllerAllNodesDeployment, ControllerSwiftDeployment, ControllerCephDeployment]
+    depends_on: [ControllerAllNodesDeployment, ControllerSwiftDeployment]
     properties:
       servers: {get_attr: [Controller, attributes, nova_server_resource]}
       RoleData: {get_attr: [ControllerServiceChain, role_data]}
 
   ComputeNodesPostDeployment:
     type: OS::TripleO::ComputePostDeployment
-    depends_on: [ComputeAllNodesDeployment, ComputeCephDeployment]
+    depends_on: [ComputeAllNodesDeployment]
     properties:
       servers: {get_attr: [Compute, attributes, nova_server_resource]}
       RoleData: {get_attr: [ComputeServiceChain, role_data]}
@@ -1279,7 +1243,7 @@ resources:
 
   CephStorageNodesPostDeployment:
     type: OS::TripleO::CephStoragePostDeployment
-    depends_on: [ControllerNodesPostDeployment, CephStorageCephDeployment, CephStorageAllNodesDeployment]
+    depends_on: [ControllerNodesPostDeployment, CephStorageAllNodesDeployment]
     properties:
       servers: {get_attr: [CephStorage, attributes, nova_server_resource]}
       RoleData: {get_attr: [CephStorageServiceChain, role_data]}