Merge "Remove legacy ceilometer api from undercloud"
This commit is contained in:
commit
6939ac649d
|
@ -172,10 +172,6 @@ if str2bool(hiera('enable_telemetry', false)) {
|
||||||
include ::ceilometer::keystone::auth
|
include ::ceilometer::keystone::auth
|
||||||
include ::aodh::keystone::auth
|
include ::aodh::keystone::auth
|
||||||
include ::ceilometer
|
include ::ceilometer
|
||||||
if str2bool(hiera('enable_legacy_ceilometer_api', false)) {
|
|
||||||
include ::ceilometer::api
|
|
||||||
include ::ceilometer::wsgi::apache
|
|
||||||
}
|
|
||||||
include ::ceilometer::agent::notification
|
include ::ceilometer::agent::notification
|
||||||
include ::ceilometer::agent::central
|
include ::ceilometer::agent::central
|
||||||
include ::ceilometer::expirer
|
include ::ceilometer::expirer
|
||||||
|
|
|
@ -282,10 +282,6 @@ ceilometer::metering_secret: {{UNDERCLOUD_CEILOMETER_METERING_SECRET}}
|
||||||
ceilometer::rabbit_userid: {{UNDERCLOUD_RABBIT_USERNAME}}
|
ceilometer::rabbit_userid: {{UNDERCLOUD_RABBIT_USERNAME}}
|
||||||
ceilometer::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
|
ceilometer::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
|
||||||
ceilometer::rabbit_host: "{{LOCAL_IP_WRAPPED}}"
|
ceilometer::rabbit_host: "{{LOCAL_IP_WRAPPED}}"
|
||||||
ceilometer::api::host: {{LOCAL_IP}}
|
|
||||||
ceilometer::api::service_name: 'httpd'
|
|
||||||
ceilometer::wsgi::apache::ssl: false
|
|
||||||
ceilometer::wsgi::apache::bind_host: {{LOCAL_IP}}
|
|
||||||
ceilometer::keystone::authtoken::password: {{UNDERCLOUD_CEILOMETER_PASSWORD}}
|
ceilometer::keystone::authtoken::password: {{UNDERCLOUD_CEILOMETER_PASSWORD}}
|
||||||
ceilometer::keystone::authtoken::auth_uri: "%{hiera('keystone_auth_uri')}"
|
ceilometer::keystone::authtoken::auth_uri: "%{hiera('keystone_auth_uri')}"
|
||||||
ceilometer::keystone::authtoken::auth_url: "%{hiera('keystone_identity_uri')}"
|
ceilometer::keystone::authtoken::auth_url: "%{hiera('keystone_identity_uri')}"
|
||||||
|
@ -829,7 +825,6 @@ swift::proxy::workers: "%{::os_workers}"
|
||||||
enable_tempest: {{ENABLE_TEMPEST}}
|
enable_tempest: {{ENABLE_TEMPEST}}
|
||||||
enable_validations: {{ENABLE_VALIDATIONS}}
|
enable_validations: {{ENABLE_VALIDATIONS}}
|
||||||
enable_telemetry: {{ENABLE_TELEMETRY}}
|
enable_telemetry: {{ENABLE_TELEMETRY}}
|
||||||
enable_legacy_ceilometer_api: {{ENABLE_LEGACY_CEILOMETER_API}}
|
|
||||||
enable_ui: {{ENABLE_UI}}
|
enable_ui: {{ENABLE_UI}}
|
||||||
enable_cinder: {{ENABLE_CINDER}}
|
enable_cinder: {{ENABLE_CINDER}}
|
||||||
enable_container_images_build: {{ENABLE_CONTAINER_IMAGES_BUILD}}
|
enable_container_images_build: {{ENABLE_CONTAINER_IMAGES_BUILD}}
|
||||||
|
@ -948,10 +943,6 @@ tripleo::firewall::firewall_rules:
|
||||||
- 6000
|
- 6000
|
||||||
- 6001
|
- 6001
|
||||||
- 6002
|
- 6002
|
||||||
'124 ceilometer':
|
|
||||||
dport:
|
|
||||||
- 8777
|
|
||||||
- 13777
|
|
||||||
'125 heat':
|
'125 heat':
|
||||||
dport:
|
dport:
|
||||||
- 8000
|
- 8000
|
||||||
|
|
|
@ -528,7 +528,7 @@ class TestGenerateEnvironment(BaseTestCase):
|
||||||
env = undercloud._generate_environment('.')
|
env = undercloud._generate_environment('.')
|
||||||
endpoint_vars = {k: v for (k, v) in env.items()
|
endpoint_vars = {k: v for (k, v) in env.items()
|
||||||
if k.startswith('UNDERCLOUD_ENDPOINT')}
|
if k.startswith('UNDERCLOUD_ENDPOINT')}
|
||||||
self.assertEqual(93, len(endpoint_vars))
|
self.assertEqual(90, len(endpoint_vars))
|
||||||
# Spot check one service
|
# Spot check one service
|
||||||
self.assertEqual('http://192.168.24.1:5000',
|
self.assertEqual('http://192.168.24.1:5000',
|
||||||
env['UNDERCLOUD_ENDPOINT_KEYSTONE_PUBLIC'])
|
env['UNDERCLOUD_ENDPOINT_KEYSTONE_PUBLIC'])
|
||||||
|
|
|
@ -326,14 +326,6 @@ _opts = [
|
||||||
default=False,
|
default=False,
|
||||||
help=('Whether to install the Volume service. It is not '
|
help=('Whether to install the Volume service. It is not '
|
||||||
'currently used in the undercloud.')),
|
'currently used in the undercloud.')),
|
||||||
cfg.BoolOpt('enable_legacy_ceilometer_api',
|
|
||||||
default=False,
|
|
||||||
help=('Whether to enable legacy ceilometer api '
|
|
||||||
'in the Undercloud. '
|
|
||||||
'Note: Ceilometer API has been deprecated and will be '
|
|
||||||
'removed in future release. Please consider moving to '
|
|
||||||
'gnocchi/Aodh/Panko API instead.')
|
|
||||||
),
|
|
||||||
cfg.BoolOpt('enable_novajoin',
|
cfg.BoolOpt('enable_novajoin',
|
||||||
default=False,
|
default=False,
|
||||||
help=('Whether to install novajoin metadata service in '
|
help=('Whether to install novajoin metadata service in '
|
||||||
|
@ -864,10 +856,6 @@ def _generate_endpoints(instack_env):
|
||||||
'%s://%s:%d/placement',
|
'%s://%s:%d/placement',
|
||||||
{'host': public_host, 'port': 8778, 'ssl_port': 13778},
|
{'host': public_host, 'port': 8778, 'ssl_port': 13778},
|
||||||
{'host': internal_host, 'port': 8778}),
|
{'host': internal_host, 'port': 8778}),
|
||||||
('ceilometer',
|
|
||||||
'%s://%s:%d',
|
|
||||||
{'host': public_host, 'port': 8777, 'ssl_port': 13777},
|
|
||||||
{'host': internal_host, 'port': 8777}),
|
|
||||||
('keystone',
|
('keystone',
|
||||||
'%s://%s:%d',
|
'%s://%s:%d',
|
||||||
{'host': public_host, 'port': 5000, 'ssl_port': 13000},
|
{'host': public_host, 'port': 5000, 'ssl_port': 13000},
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Remove legacy ceilometer api from undercloud. This was moved to legacy
|
||||||
|
mode in Pike.
|
|
@ -172,12 +172,6 @@
|
||||||
# the undercloud. (boolean value)
|
# the undercloud. (boolean value)
|
||||||
#enable_cinder = false
|
#enable_cinder = false
|
||||||
|
|
||||||
# Whether to enable legacy ceilometer api in the Undercloud. Note:
|
|
||||||
# Ceilometer API has been deprecated and will be removed in future
|
|
||||||
# release. Please consider moving to gnocchi/Aodh/Panko API instead.
|
|
||||||
# (boolean value)
|
|
||||||
#enable_legacy_ceilometer_api = false
|
|
||||||
|
|
||||||
# Whether to install novajoin metadata service in the Undercloud.
|
# Whether to install novajoin metadata service in the Undercloud.
|
||||||
# (boolean value)
|
# (boolean value)
|
||||||
#enable_novajoin = false
|
#enable_novajoin = false
|
||||||
|
|
Loading…
Reference in New Issue