From 64e6e17f034b8d1950cf34fb5e17b426e7098387 Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Wed, 27 Sep 2017 13:23:40 -0400 Subject: [PATCH] Remove legacy ceilometer api from undercloud Ceilometer API is deprecated and disabled in pike. Lets remove this starting queens as its not supported anymore. Change-Id: I738e8743a315cc2865ba6d1e64c23498e911a283 --- elements/puppet-stack-config/puppet-stack-config.pp | 4 ---- .../puppet-stack-config.yaml.template | 9 --------- instack_undercloud/tests/test_undercloud.py | 2 +- instack_undercloud/undercloud.py | 12 ------------ .../drop-legacy-ceilometer-api-b4b3540353f24905.yaml | 5 +++++ undercloud.conf.sample | 6 ------ 6 files changed, 6 insertions(+), 32 deletions(-) create mode 100644 releasenotes/notes/drop-legacy-ceilometer-api-b4b3540353f24905.yaml diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp index 3f1db6776..dcb5b4a81 100644 --- a/elements/puppet-stack-config/puppet-stack-config.pp +++ b/elements/puppet-stack-config/puppet-stack-config.pp @@ -168,10 +168,6 @@ if str2bool(hiera('enable_telemetry', false)) { include ::ceilometer::keystone::auth include ::aodh::keystone::auth include ::ceilometer - if str2bool(hiera('enable_legacy_ceilometer_api', false)) { - include ::ceilometer::api - include ::ceilometer::wsgi::apache - } include ::ceilometer::agent::notification include ::ceilometer::agent::central include ::ceilometer::expirer diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template index 6ef7ece20..d68a50022 100644 --- a/elements/puppet-stack-config/puppet-stack-config.yaml.template +++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template @@ -283,10 +283,6 @@ ceilometer::metering_secret: {{UNDERCLOUD_CEILOMETER_METERING_SECRET}} ceilometer::rabbit_userid: {{UNDERCLOUD_RABBIT_USERNAME}} ceilometer::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}} 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::auth_uri: "%{hiera('keystone_auth_uri')}" ceilometer::keystone::authtoken::auth_url: "%{hiera('keystone_identity_uri')}" @@ -829,7 +825,6 @@ swift::proxy::workers: "%{::os_workers}" enable_tempest: {{ENABLE_TEMPEST}} enable_validations: {{ENABLE_VALIDATIONS}} enable_telemetry: {{ENABLE_TELEMETRY}} -enable_legacy_ceilometer_api: {{ENABLE_LEGACY_CEILOMETER_API}} enable_ui: {{ENABLE_UI}} enable_cinder: {{ENABLE_CINDER}} enable_container_images_build: {{ENABLE_CONTAINER_IMAGES_BUILD}} @@ -948,10 +943,6 @@ tripleo::firewall::firewall_rules: - 6000 - 6001 - 6002 - '124 ceilometer': - dport: - - 8777 - - 13777 '125 heat': dport: - 8000 diff --git a/instack_undercloud/tests/test_undercloud.py b/instack_undercloud/tests/test_undercloud.py index b9a29ca2d..2bb94f1e0 100644 --- a/instack_undercloud/tests/test_undercloud.py +++ b/instack_undercloud/tests/test_undercloud.py @@ -528,7 +528,7 @@ class TestGenerateEnvironment(BaseTestCase): env = undercloud._generate_environment('.') endpoint_vars = {k: v for (k, v) in env.items() if k.startswith('UNDERCLOUD_ENDPOINT')} - self.assertEqual(93, len(endpoint_vars)) + self.assertEqual(90, len(endpoint_vars)) # Spot check one service self.assertEqual('http://192.168.24.1:5000', env['UNDERCLOUD_ENDPOINT_KEYSTONE_PUBLIC']) diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py index 10a7a7519..b4202eb6a 100644 --- a/instack_undercloud/undercloud.py +++ b/instack_undercloud/undercloud.py @@ -328,14 +328,6 @@ _opts = [ default=False, help=('Whether to install the Volume service. It is not ' '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', default=False, help=('Whether to install novajoin metadata service in ' @@ -848,10 +840,6 @@ def _generate_endpoints(instack_env): '%s://%s:%d/placement', {'host': public_host, 'port': 8778, 'ssl_port': 13778}, {'host': internal_host, 'port': 8778}), - ('ceilometer', - '%s://%s:%d', - {'host': public_host, 'port': 8777, 'ssl_port': 13777}, - {'host': internal_host, 'port': 8777}), ('keystone', '%s://%s:%d', {'host': public_host, 'port': 5000, 'ssl_port': 13000}, diff --git a/releasenotes/notes/drop-legacy-ceilometer-api-b4b3540353f24905.yaml b/releasenotes/notes/drop-legacy-ceilometer-api-b4b3540353f24905.yaml new file mode 100644 index 000000000..c03d6aa2c --- /dev/null +++ b/releasenotes/notes/drop-legacy-ceilometer-api-b4b3540353f24905.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Remove legacy ceilometer api from undercloud. This was moved to legacy + mode in Pike. diff --git a/undercloud.conf.sample b/undercloud.conf.sample index 405122d6c..ff0e3ff22 100644 --- a/undercloud.conf.sample +++ b/undercloud.conf.sample @@ -172,12 +172,6 @@ # the undercloud. (boolean value) #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. # (boolean value) #enable_novajoin = false