diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-06 16:35:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-06 16:35:30 +0000 |
| commit | 799359847de4a241eccbb738f8235de74073d185 (patch) | |
| tree | 8aba8bb53d39c89bd09b57722c2a8e8ca9edd772 | |
| parent | 07ebc0224a52b779bf18c8f98d9b887786c666a4 (diff) | |
| parent | 0e8e8a920dec478453293740669101d62c6c740a (diff) | |
Merge "Disable ceilometer API"
| -rw-r--r-- | environments/services/ceilometer-api.yaml | 6 | ||||
| -rw-r--r-- | environments/services/disable-ceilometer-api.yaml | 5 | ||||
| -rw-r--r-- | puppet/services/ceilometer-base.yaml | 2 | ||||
| -rw-r--r-- | releasenotes/notes/disable-ceilo-api-dfe5d0947563bbe0.yaml | 4 | ||||
| -rw-r--r-- | roles_data.yaml | 1 |
5 files changed, 11 insertions, 7 deletions
diff --git a/environments/services/ceilometer-api.yaml b/environments/services/ceilometer-api.yaml new file mode 100644 index 00000000..1e37e73b --- /dev/null +++ b/environments/services/ceilometer-api.yaml @@ -0,0 +1,6 @@ +resource_registry: + OS::TripleO::Services::CeilometerApi: ../../puppet/services/ceilometer-api.yaml + +parameter_defaults: + CeilometerApiEndpoint: true + diff --git a/environments/services/disable-ceilometer-api.yaml b/environments/services/disable-ceilometer-api.yaml deleted file mode 100644 index fb1ea6a7..00000000 --- a/environments/services/disable-ceilometer-api.yaml +++ /dev/null @@ -1,5 +0,0 @@ -resource_registry: - OS::TripleO::Services::CeilometerApi: OS::Heat::None - -parameter_defaults: - CeilometerApiEndpoint: false diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml index 185ffdc3..e1613720 100644 --- a/puppet/services/ceilometer-base.yaml +++ b/puppet/services/ceilometer-base.yaml @@ -77,7 +77,7 @@ parameters: description: Set rabbit subscriber port, change this if using SSL type: number CeilometerApiEndpoint: - default: true + default: false description: Whether to create or skip API endpoint. Set this to false, if you choose to disable Ceilometer API service. type: boolean diff --git a/releasenotes/notes/disable-ceilo-api-dfe5d0947563bbe0.yaml b/releasenotes/notes/disable-ceilo-api-dfe5d0947563bbe0.yaml new file mode 100644 index 00000000..2661f7c9 --- /dev/null +++ b/releasenotes/notes/disable-ceilo-api-dfe5d0947563bbe0.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - Deprecate and disable ceilometer Api by default. This can be enabled + by passing in an env file to deploy command. diff --git a/roles_data.yaml b/roles_data.yaml index 780c9c93..32bb393a 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -83,7 +83,6 @@ - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd - OS::TripleO::Services::Timezone - - OS::TripleO::Services::CeilometerApi - OS::TripleO::Services::CeilometerCollector - OS::TripleO::Services::CeilometerExpirer - OS::TripleO::Services::CeilometerAgentCentral |