diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-07-11 20:23:24 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-07-11 20:23:24 +0000 |
commit | cf8b152c31303f7f4c8d562dbbbc3c1399c6c4dd (patch) | |
tree | 70e21d409e2c45e6c0251bdd3e63126395fda6c0 /overcloud.yaml | |
parent | 0dd151201f86688ce8cf1773ccacf69932a996c1 (diff) | |
parent | 81863d101478ec0d74402cbe11127cbb39ce7d5b (diff) |
Merge "Re-enable Ceilometer composable roles for controller"
Diffstat (limited to 'overcloud.yaml')
-rw-r--r-- | overcloud.yaml | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index cc345572..255c7b57 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -20,24 +20,6 @@ parameters: description: The password for the aodh services. type: string hidden: true - CeilometerBackend: - default: 'mongodb' - description: The ceilometer backend type. - type: string - CeilometerMeteringSecret: - description: Secret shared by the ceilometer services. - type: string - hidden: true - CeilometerPassword: - description: The password for the ceilometer service account. - type: string - hidden: true - CeilometerMeterDispatcher: - default: 'database' - description: Dispatcher to process meter data - type: string - constraints: - - allowed_values: ['gnocchi', 'database'] CinderEnableNfsBackend: default: false description: Whether to enable or not the NFS backend for Cinder @@ -525,6 +507,11 @@ parameters: - OS::TripleO::Services::SwiftStorage - OS::TripleO::Services::Snmp - OS::TripleO::Services::Timezone + - OS::TripleO::Services::CeilometerApi + - OS::TripleO::Services::CeilometerCollector + - OS::TripleO::Services::CeilometerExpirer + - OS::TripleO::Services::CeilometerAgentCentral + - OS::TripleO::Services::CeilometerAgentNotification 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 Controllers. @@ -785,10 +772,6 @@ resources: properties: AdminPassword: {get_param: AdminPassword} AodhPassword: {get_param: AodhPassword} - CeilometerBackend: {get_param: CeilometerBackend} - CeilometerMeteringSecret: {get_param: CeilometerMeteringSecret} - CeilometerPassword: {get_param: CeilometerPassword} - CeilometerMeterDispatcher: {get_param: CeilometerMeterDispatcher} CloudDomain: {get_param: CloudDomain} ControlVirtualInterface: {get_param: ControlVirtualInterface} controllerExtraConfig: {get_param: controllerExtraConfig} @@ -868,8 +851,6 @@ resources: properties: AdminPassword: {get_param: AdminPassword} CeilometerComputeAgent: {get_param: CeilometerComputeAgent} - CeilometerMeteringSecret: {get_param: CeilometerMeteringSecret} - CeilometerPassword: {get_param: CeilometerPassword} CinderEnableNfsBackend: {get_param: CinderEnableNfsBackend} CinderEnableRbdBackend: {get_param: CinderEnableRbdBackend} Debug: {get_param: Debug} |