X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=overcloud.yaml;h=aeb1c1bbd213f47347c0bd5a3fdeeed701957ecc;hb=1a3b3fca69c4e3c7b9cd9b35c12fd1b5272d199e;hp=9c14121bba0e81687f219ff1eee2c88a38e13b6f;hpb=0c07a26ae0a45e7c08796876f589d03e6a3636ec;p=apex-tripleo-heat-templates.git

diff --git a/overcloud.yaml b/overcloud.yaml
index 9c14121b..aeb1c1bb 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -271,12 +271,6 @@ parameters:
     description: How many replicas to use in the swift rings.
 
 # Compute-specific params
-  CeilometerComputeAgent:
-    description: Indicates whether the Compute agent is present and expects nova-compute to be configured accordingly
-    type: string
-    default: ''
-    constraints:
-    - allowed_values: ['', Present]
   ComputeCount:
     type: number
     default: 1
@@ -387,6 +381,7 @@ parameters:
       - OS::TripleO::Services::HeatApiCfn
       - OS::TripleO::Services::HeatApiCloudwatch
       - OS::TripleO::Services::HeatEngine
+      - OS::TripleO::Services::MySQL
       - OS::TripleO::Services::NeutronDhcpAgent
       - OS::TripleO::Services::NeutronL3Agent
       - OS::TripleO::Services::NeutronMetadataAgent
@@ -397,6 +392,7 @@ parameters:
       - OS::TripleO::Services::HAproxy
       - OS::TripleO::Services::Keepalived
       - OS::TripleO::Services::Memcached
+      - OS::TripleO::Services::Pacemaker
       - OS::TripleO::Services::Redis
       - OS::TripleO::Services::NovaConductor
       - OS::TripleO::Services::MongoDb
@@ -436,6 +432,7 @@ parameters:
       - OS::TripleO::Services::Kernel
       - OS::TripleO::Services::ComputeNeutronCorePlugin
       - OS::TripleO::Services::ComputeNeutronOvsAgent
+      - OS::TripleO::Services::ComputeCeilometerAgent
     description: A list of service resources (configured in the Heat
                  resource_registry) which represent nested stacks
                  for each service that should get installed on the Compute Nodes.
@@ -754,7 +751,6 @@ resources:
         type: OS::TripleO::Compute
         properties:
           AdminPassword: {get_param: AdminPassword}
-          CeilometerComputeAgent: {get_param: CeilometerComputeAgent}
           CinderEnableNfsBackend: {get_param: CinderEnableNfsBackend}
           CinderEnableRbdBackend: {get_param: CinderEnableRbdBackend}
           Debug: {get_param: Debug}