From f8d0edac5f640f2c843ab0fc80628ba058945d6e Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 4 May 2018 17:52:10 -0600 Subject: [PATCH] Drop old ceilometer services These were needed for FFU to Queens so we should remove them for Rocky. Change-Id: I0e24d19cd17d35644fa02e989fa9ef592195b9f1 --- environments/baremetal-services.yaml | 3 - environments/no-tls-endpoints-public-ip.yaml | 3 - .../ssl/tls-endpoints-public-dns.yaml | 3 - environments/ssl/tls-endpoints-public-ip.yaml | 3 - .../ssl/tls-everywhere-endpoints-dns.yaml | 3 - environments/tls-endpoints-public-dns.yaml | 3 - environments/tls-endpoints-public-ip.yaml | 3 - .../tls-everywhere-endpoints-dns.yaml | 3 - network/endpoints/endpoint_data.yaml | 9 - network/endpoints/endpoint_map.yaml | 246 ------------------ network/service_net_map.j2.yaml | 1 - overcloud-resource-registry-puppet.j2.yaml | 4 - puppet/services/ceilometer-base.yaml | 33 +-- .../disabled/ceilometer-api-disabled.yaml | 49 ---- .../ceilometer-collector-disabled.yaml | 58 ----- .../disabled/ceilometer-expirer-disabled.yaml | 51 ---- roles/Controller.yaml | 3 - roles/ControllerAllNovaStandalone.yaml | 3 - roles/ControllerNoCeph.yaml | 3 - roles/ControllerNovaStandalone.yaml | 3 - roles/ControllerOpenstack.yaml | 3 - roles_data.yaml | 3 - sample-env-generator/ssl.yaml | 9 - 23 files changed, 2 insertions(+), 500 deletions(-) delete mode 100644 puppet/services/disabled/ceilometer-api-disabled.yaml delete mode 100644 puppet/services/disabled/ceilometer-collector-disabled.yaml delete mode 100644 puppet/services/disabled/ceilometer-expirer-disabled.yaml diff --git a/environments/baremetal-services.yaml b/environments/baremetal-services.yaml index 7c49d17e3b..f708b01293 100644 --- a/environments/baremetal-services.yaml +++ b/environments/baremetal-services.yaml @@ -10,9 +10,6 @@ resource_registry: OS::TripleO::Services::CeilometerAgentCentral: ../puppet/services/ceilometer-agent-central.yaml OS::TripleO::Services::CeilometerAgentIpmi: ../puppet/services/ceilometer-agent-ipmi.yaml OS::TripleO::Services::CeilometerAgentNotification: ../puppet/services/ceilometer-agent-notification.yaml - OS::TripleO::Services::CeilometerApi: ../puppet/services/disabled/ceilometer-api-disabled.yaml - OS::TripleO::Services::CeilometerCollector: ../puppet/services/disabled/ceilometer-collector-disabled.yaml - OS::TripleO::Services::CeilometerExpirer: ../puppet/services/disabled/ceilometer-expirer-disabled.yaml OS::TripleO::Services::CinderApi: ../puppet/services/cinder-api.yaml OS::TripleO::Services::CinderScheduler: ../puppet/services/cinder-scheduler.yaml OS::TripleO::Services::CinderVolume: ../puppet/services/cinder-volume.yaml diff --git a/environments/no-tls-endpoints-public-ip.yaml b/environments/no-tls-endpoints-public-ip.yaml index 57c4738313..508e9353c8 100644 --- a/environments/no-tls-endpoints-public-ip.yaml +++ b/environments/no-tls-endpoints-public-ip.yaml @@ -22,9 +22,6 @@ parameter_defaults: BarbicanAdmin: {protocol: http, port: '9311', host: IP_ADDRESS} BarbicanInternal: {protocol: http, port: '9311', host: IP_ADDRESS} BarbicanPublic: {protocol: http, port: '9311', host: IP_ADDRESS} - CeilometerAdmin: {protocol: http, port: '8777', host: IP_ADDRESS} - CeilometerInternal: {protocol: http, port: '8777', host: IP_ADDRESS} - CeilometerPublic: {protocol: http, port: '8777', host: IP_ADDRESS} CephRgwAdmin: {protocol: http, port: '8080', host: IP_ADDRESS} CephRgwInternal: {protocol: http, port: '8080', host: IP_ADDRESS} CephRgwPublic: {protocol: http, port: '8080', host: IP_ADDRESS} diff --git a/environments/ssl/tls-endpoints-public-dns.yaml b/environments/ssl/tls-endpoints-public-dns.yaml index 8a661554ea..dd08e61a2a 100644 --- a/environments/ssl/tls-endpoints-public-dns.yaml +++ b/environments/ssl/tls-endpoints-public-dns.yaml @@ -18,9 +18,6 @@ parameter_defaults: BarbicanAdmin: {protocol: 'http', port: '9311', host: 'IP_ADDRESS'} BarbicanInternal: {protocol: 'http', port: '9311', host: 'IP_ADDRESS'} BarbicanPublic: {protocol: 'https', port: '13311', host: 'CLOUDNAME'} - CeilometerAdmin: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'} - CeilometerInternal: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'} - CeilometerPublic: {protocol: 'https', port: '13777', host: 'CLOUDNAME'} CephRgwAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'} CephRgwInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'} CephRgwPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'} diff --git a/environments/ssl/tls-endpoints-public-ip.yaml b/environments/ssl/tls-endpoints-public-ip.yaml index d1f3e50bbd..5729fd029d 100644 --- a/environments/ssl/tls-endpoints-public-ip.yaml +++ b/environments/ssl/tls-endpoints-public-ip.yaml @@ -18,9 +18,6 @@ parameter_defaults: BarbicanAdmin: {protocol: 'http', port: '9311', host: 'IP_ADDRESS'} BarbicanInternal: {protocol: 'http', port: '9311', host: 'IP_ADDRESS'} BarbicanPublic: {protocol: 'https', port: '13311', host: 'IP_ADDRESS'} - CeilometerAdmin: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'} - CeilometerInternal: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'} - CeilometerPublic: {protocol: 'https', port: '13777', host: 'IP_ADDRESS'} CephRgwAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'} CephRgwInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'} CephRgwPublic: {protocol: 'https', port: '13808', host: 'IP_ADDRESS'} diff --git a/environments/ssl/tls-everywhere-endpoints-dns.yaml b/environments/ssl/tls-everywhere-endpoints-dns.yaml index 2f015d9039..9837850eb7 100644 --- a/environments/ssl/tls-everywhere-endpoints-dns.yaml +++ b/environments/ssl/tls-everywhere-endpoints-dns.yaml @@ -18,9 +18,6 @@ parameter_defaults: BarbicanAdmin: {protocol: 'https', port: '9311', host: 'CLOUDNAME'} BarbicanInternal: {protocol: 'https', port: '9311', host: 'CLOUDNAME'} BarbicanPublic: {protocol: 'https', port: '13311', host: 'CLOUDNAME'} - CeilometerAdmin: {protocol: 'https', port: '8777', host: 'CLOUDNAME'} - CeilometerInternal: {protocol: 'https', port: '8777', host: 'CLOUDNAME'} - CeilometerPublic: {protocol: 'https', port: '13777', host: 'CLOUDNAME'} CephRgwAdmin: {protocol: 'https', port: '8080', host: 'CLOUDNAME'} CephRgwInternal: {protocol: 'https', port: '8080', host: 'CLOUDNAME'} CephRgwPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'} diff --git a/environments/tls-endpoints-public-dns.yaml b/environments/tls-endpoints-public-dns.yaml index 0802a9a927..43dc1cbbb6 100644 --- a/environments/tls-endpoints-public-dns.yaml +++ b/environments/tls-endpoints-public-dns.yaml @@ -12,9 +12,6 @@ parameter_defaults: BarbicanAdmin: {protocol: 'http', port: '9311', host: 'IP_ADDRESS'} BarbicanInternal: {protocol: 'http', port: '9311', host: 'IP_ADDRESS'} BarbicanPublic: {protocol: 'https', port: '13311', host: 'CLOUDNAME'} - CeilometerAdmin: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'} - CeilometerInternal: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'} - CeilometerPublic: {protocol: 'https', port: '13777', host: 'CLOUDNAME'} CephRgwAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'} CephRgwInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'} CephRgwPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'} diff --git a/environments/tls-endpoints-public-ip.yaml b/environments/tls-endpoints-public-ip.yaml index e40389bc92..5319ce2e36 100644 --- a/environments/tls-endpoints-public-ip.yaml +++ b/environments/tls-endpoints-public-ip.yaml @@ -12,9 +12,6 @@ parameter_defaults: BarbicanAdmin: {protocol: 'http', port: '9311', host: 'IP_ADDRESS'} BarbicanInternal: {protocol: 'http', port: '9311', host: 'IP_ADDRESS'} BarbicanPublic: {protocol: 'https', port: '13311', host: 'IP_ADDRESS'} - CeilometerAdmin: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'} - CeilometerInternal: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'} - CeilometerPublic: {protocol: 'https', port: '13777', host: 'IP_ADDRESS'} CephRgwAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'} CephRgwInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'} CephRgwPublic: {protocol: 'https', port: '13808', host: 'IP_ADDRESS'} diff --git a/environments/tls-everywhere-endpoints-dns.yaml b/environments/tls-everywhere-endpoints-dns.yaml index 9ed86383bc..48b48f59c6 100644 --- a/environments/tls-everywhere-endpoints-dns.yaml +++ b/environments/tls-everywhere-endpoints-dns.yaml @@ -8,9 +8,6 @@ parameter_defaults: BarbicanAdmin: {protocol: 'https', port: '9311', host: 'CLOUDNAME'} BarbicanInternal: {protocol: 'https', port: '9311', host: 'CLOUDNAME'} BarbicanPublic: {protocol: 'https', port: '13311', host: 'CLOUDNAME'} - CeilometerAdmin: {protocol: 'https', port: '8777', host: 'CLOUDNAME'} - CeilometerInternal: {protocol: 'https', port: '8777', host: 'CLOUDNAME'} - CeilometerPublic: {protocol: 'https', port: '13777', host: 'CLOUDNAME'} CephRgwAdmin: {protocol: 'https', port: '8080', host: 'CLOUDNAME'} CephRgwInternal: {protocol: 'https', port: '8080', host: 'CLOUDNAME'} CephRgwPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'} diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml index a8aa8b176f..73d3e6f5af 100644 --- a/network/endpoints/endpoint_data.yaml +++ b/network/endpoints/endpoint_data.yaml @@ -19,15 +19,6 @@ Barbican: net_param: BarbicanApi port: 9311 -Ceilometer: - Internal: - net_param: CeilometerApi - Public: - net_param: Public - Admin: - net_param: CeilometerApi - port: 8777 - Designate: Internal: net_param: DesignateApi diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml index 71d3b51103..1346b94c4b 100644 --- a/network/endpoints/endpoint_map.yaml +++ b/network/endpoints/endpoint_map.yaml @@ -25,9 +25,6 @@ parameters: BarbicanAdmin: {protocol: http, port: '9311', host: IP_ADDRESS} BarbicanInternal: {protocol: http, port: '9311', host: IP_ADDRESS} BarbicanPublic: {protocol: http, port: '9311', host: IP_ADDRESS} - CeilometerAdmin: {protocol: http, port: '8777', host: IP_ADDRESS} - CeilometerInternal: {protocol: http, port: '8777', host: IP_ADDRESS} - CeilometerPublic: {protocol: http, port: '8777', host: IP_ADDRESS} CephRgwAdmin: {protocol: http, port: '8080', host: IP_ADDRESS} CephRgwInternal: {protocol: http, port: '8080', host: IP_ADDRESS} CephRgwPublic: {protocol: http, port: '8080', host: IP_ADDRESS} @@ -613,249 +610,6 @@ outputs: template: NETWORK_uri port: get_param: [EndpointMap, BarbicanPublic, port] - CeilometerAdmin: - host: - str_replace: - template: - get_param: [EndpointMap, CeilometerAdmin, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, CeilometerApiNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, CeilometerApiNetwork] - template: NETWORK_uri - host_nobrackets: - str_replace: - template: - get_param: [EndpointMap, CeilometerAdmin, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, CeilometerApiNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: [ServiceNetMap, CeilometerApiNetwork] - port: - get_param: [EndpointMap, CeilometerAdmin, port] - protocol: - get_param: [EndpointMap, CeilometerAdmin, protocol] - uri: - make_url: - scheme: - get_param: [EndpointMap, CeilometerAdmin, protocol] - host: - str_replace: - template: - get_param: [EndpointMap, CeilometerAdmin, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, CeilometerApiNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, CeilometerApiNetwork] - template: NETWORK_uri - port: - get_param: [EndpointMap, CeilometerAdmin, port] - uri_no_suffix: - make_url: - scheme: - get_param: [EndpointMap, CeilometerAdmin, protocol] - host: - str_replace: - template: - get_param: [EndpointMap, CeilometerAdmin, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, CeilometerApiNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, CeilometerApiNetwork] - template: NETWORK_uri - port: - get_param: [EndpointMap, CeilometerAdmin, port] - CeilometerInternal: - host: - str_replace: - template: - get_param: [EndpointMap, CeilometerInternal, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, CeilometerApiNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, CeilometerApiNetwork] - template: NETWORK_uri - host_nobrackets: - str_replace: - template: - get_param: [EndpointMap, CeilometerInternal, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, CeilometerApiNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: [ServiceNetMap, CeilometerApiNetwork] - port: - get_param: [EndpointMap, CeilometerInternal, port] - protocol: - get_param: [EndpointMap, CeilometerInternal, protocol] - uri: - make_url: - scheme: - get_param: [EndpointMap, CeilometerInternal, protocol] - host: - str_replace: - template: - get_param: [EndpointMap, CeilometerInternal, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, CeilometerApiNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, CeilometerApiNetwork] - template: NETWORK_uri - port: - get_param: [EndpointMap, CeilometerInternal, port] - uri_no_suffix: - make_url: - scheme: - get_param: [EndpointMap, CeilometerInternal, protocol] - host: - str_replace: - template: - get_param: [EndpointMap, CeilometerInternal, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, CeilometerApiNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, CeilometerApiNetwork] - template: NETWORK_uri - port: - get_param: [EndpointMap, CeilometerInternal, port] - CeilometerPublic: - host: - str_replace: - template: - get_param: [EndpointMap, CeilometerPublic, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, PublicNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, PublicNetwork] - template: NETWORK_uri - host_nobrackets: - str_replace: - template: - get_param: [EndpointMap, CeilometerPublic, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, PublicNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: [ServiceNetMap, PublicNetwork] - port: - get_param: [EndpointMap, CeilometerPublic, port] - protocol: - get_param: [EndpointMap, CeilometerPublic, protocol] - uri: - make_url: - scheme: - get_param: [EndpointMap, CeilometerPublic, protocol] - host: - str_replace: - template: - get_param: [EndpointMap, CeilometerPublic, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, PublicNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, PublicNetwork] - template: NETWORK_uri - port: - get_param: [EndpointMap, CeilometerPublic, port] - uri_no_suffix: - make_url: - scheme: - get_param: [EndpointMap, CeilometerPublic, protocol] - host: - str_replace: - template: - get_param: [EndpointMap, CeilometerPublic, host] - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: [ServiceNetMap, PublicNetwork] - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: [ServiceNetMap, PublicNetwork] - template: NETWORK_uri - port: - get_param: [EndpointMap, CeilometerPublic, port] CephRgwAdmin: host: str_replace: diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml index 29ed33ef2f..a87f5f914f 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -26,7 +26,6 @@ parameters: # overridden. ApacheNetwork: internal_api NeutronTenantNetwork: tenant - CeilometerApiNetwork: internal_api AodhApiNetwork: internal_api PankoApiNetwork: internal_api BarbicanApiNetwork: internal_api diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 178cecbe36..d60280629b 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -214,10 +214,6 @@ resource_registry: OS::TripleO::Services::Snmp: puppet/services/snmp.yaml OS::TripleO::Services::Tacker: OS::Heat::None OS::TripleO::Services::Timezone: puppet/services/time/timezone.yaml - # Need these in Queens for FFU, Drop them in Rocky - OS::TripleO::Services::CeilometerApi: puppet/services/disabled/ceilometer-api-disabled.yaml - OS::TripleO::Services::CeilometerCollector: puppet/services/disabled/ceilometer-collector-disabled.yaml - OS::TripleO::Services::CeilometerExpirer: puppet/services/disabled/ceilometer-expirer-disabled.yaml OS::TripleO::Services::CeilometerAgentCentral: docker/services/ceilometer-agent-central.yaml OS::TripleO::Services::CeilometerAgentIpmi: docker/services/ceilometer-agent-ipmi.yaml OS::TripleO::Services::CeilometerAgentNotification: docker/services/ceilometer-agent-notification.yaml diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml index 4b08159738..f9bb912e20 100644 --- a/puppet/services/ceilometer-base.yaml +++ b/puppet/services/ceilometer-base.yaml @@ -38,10 +38,6 @@ parameters: description: The password for the ceilometer service account. type: string hidden: true - CeilometerWorkers: - default: 0 - description: Number of workers for Ceilometer service. - type: number ManageEventPipeline: default: true description: Whether to manage event_pipeline.yaml. @@ -84,11 +80,6 @@ parameters: type: string default: 'regionOne' description: Keystone region for endpoint - CeilometerApiEndpoint: - default: false - description: Whether to create or skip API endpoint. Set this to - false, if you choose to disable Ceilometer API service. - type: boolean SnmpdReadonlyUserName: default: ro_snmp_user description: The user name for SNMPd with readonly rights running on all Overcloud nodes @@ -126,16 +117,6 @@ parameters: an SSL connection to the messaging host. type: string -parameter_groups: -- label: deprecated - description: | - The following parameters are deprecated and will be removed. They should not - be relied on for new deployments. If you have concerns regarding deprecated - parameters, please contact the TripleO development team on IRC or the - OpenStack mailing list. - parameters: - - CeilometerWorkers - conditions: service_debug_unset: {equals : [{get_param: CeilometerDebug}, '']} @@ -187,20 +168,10 @@ outputs: service_config_settings: keystone: ceilometer_auth_enabled: true - ceilometer::keystone::auth::public_url: {get_param: [EndpointMap, CeilometerPublic, uri]} - ceilometer::keystone::auth::internal_url: {get_param: [EndpointMap, CeilometerInternal, uri]} - ceilometer::keystone::auth::admin_url: {get_param: [EndpointMap, CeilometerAdmin, uri]} + # NOTE(aschultz): no endpoints since ceilometer api removal + ceilometer::keystone::auth::configure_endpoint: false ceilometer::keystone::auth::password: {get_param: CeilometerPassword} ceilometer::keystone::auth::region: {get_param: KeystoneRegion} ceilometer::keystone::auth::tenant: 'service' - ceilometer::keystone::auth::configure_endpoint: {get_param: CeilometerApiEndpoint} # Enable default notification queue tripleo::profile::base::keystone::ceilometer_notification_topics: ["notifications"] - mysql: - ceilometer::db::mysql::password: {get_param: CeilometerPassword} - ceilometer::db::mysql::user: ceilometer - ceilometer::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]} - ceilometer::db::mysql::dbname: ceilometer - ceilometer::db::mysql::allowed_hosts: - - '%' - - "%{hiera('mysql_bind_host')}" diff --git a/puppet/services/disabled/ceilometer-api-disabled.yaml b/puppet/services/disabled/ceilometer-api-disabled.yaml deleted file mode 100644 index ba7bd0643f..0000000000 --- a/puppet/services/disabled/ceilometer-api-disabled.yaml +++ /dev/null @@ -1,49 +0,0 @@ -heat_template_version: rocky - -description: > - OpenStack Ceilometer API service, disabled since pike - -parameters: - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. This - mapping overrides those in ServiceNetMapDefaults. - type: json - DefaultPasswords: - default: {} - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - -outputs: - role_data: - description: Role data for the disabled Ceilometer API role. - value: - service_name: ceilometer_api_disabled - fast_forward_upgrade_tasks: - - name: Purge Ceilometer apache config files - file: path=/etc/httpd/conf.d/10-ceilometer_wsgi.conf state=absent - when: - - step|int == 1 - - release == 'ocata' - - name: Clean up ceilometer port from ports.conf - lineinfile: dest=/etc/httpd/conf/ports.conf state=absent regexp="8777$" - when: - - step|int == 1 - - release == 'ocata' diff --git a/puppet/services/disabled/ceilometer-collector-disabled.yaml b/puppet/services/disabled/ceilometer-collector-disabled.yaml deleted file mode 100644 index e6188481f8..0000000000 --- a/puppet/services/disabled/ceilometer-collector-disabled.yaml +++ /dev/null @@ -1,58 +0,0 @@ -heat_template_version: rocky - -description: > - OpenStack Ceilometer Collector service, disabled since pike - -parameters: - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. This - mapping overrides those in ServiceNetMapDefaults. - type: json - DefaultPasswords: - default: {} - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - -outputs: - role_data: - description: Role data for the disabled Ceilometer Collector role. - value: - service_name: ceilometer_collector_disabled - fast_forward_upgrade_tasks: - - name: FFU check if openstack-ceilometer-collector is deployed - command: systemctl is-enabled --quiet openstack-ceilometer-collector - ignore_errors: True - register: ceilometer_agent_collector_enabled_result - when: - - step|int == 0 - - release == 'ocata' - - name: Set fact ceilometer_agent_collector_enabled - set_fact: - ceilometer_agent_collector_enabled: "{{ ceilometer_agent_collector_enabled_result.rc == 0 }}" - when: - - step|int == 0 - - release == 'ocata' - - name: Stop and disable ceilometer_collector service on upgrade - service: name=openstack-ceilometer-collector state=stopped enabled=no - when: - - step|int == 1 - - release == 'ocata' - - ceilometer_agent_collector_enabled|bool diff --git a/puppet/services/disabled/ceilometer-expirer-disabled.yaml b/puppet/services/disabled/ceilometer-expirer-disabled.yaml deleted file mode 100644 index 7ee200c322..0000000000 --- a/puppet/services/disabled/ceilometer-expirer-disabled.yaml +++ /dev/null @@ -1,51 +0,0 @@ -heat_template_version: rocky - -description: > - OpenStack Ceilometer Expirer service, disabled since pike - -parameters: - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. This - mapping overrides those in ServiceNetMapDefaults. - type: json - DefaultPasswords: - default: {} - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - -outputs: - role_data: - description: Role data for the disabling Ceilometer Expirer role. - value: - service_name: ceilometer_expirer_disabled - fast_forward_upgrade_tasks: - - name: Remove ceilometer expirer cron tab on upgrade - shell: '/usr/bin/crontab -u ceilometer -r' - register: remove_ceilometer_expirer_crontab - failed_when: - - step|int == 1 - - release == 'ocata' - - remove_ceilometer_expirer_crontab.rc != 0 - - remove_ceilometer_expirer_crontab.stderr != "no crontab for ceilometer" - changed_when: - - step|int == 1 - - release == 'ocata' - - remove_ceilometer_expirer_crontab.stderr != "no crontab for ceilometer" diff --git a/roles/Controller.yaml b/roles/Controller.yaml index 1be7b11885..77a79f7374 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -39,9 +39,6 @@ - OS::TripleO::Services::BarbicanBackendKmip - OS::TripleO::Services::BarbicanBackendPkcs11Crypto - OS::TripleO::Services::CACerts - - OS::TripleO::Services::CeilometerApi - - OS::TripleO::Services::CeilometerCollector - - OS::TripleO::Services::CeilometerExpirer - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification - OS::TripleO::Services::CephExternal diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index 324699d117..b750d5e040 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/roles/ControllerAllNovaStandalone.yaml @@ -26,9 +26,6 @@ - OS::TripleO::Services::BarbicanApi - OS::TripleO::Services::BarbicanBackendSimpleCrypto - OS::TripleO::Services::CACerts - - OS::TripleO::Services::CeilometerApi - - OS::TripleO::Services::CeilometerCollector - - OS::TripleO::Services::CeilometerExpirer - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification - OS::TripleO::Services::CephExternal diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index dbc245430e..aad0a391ca 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -36,9 +36,6 @@ - OS::TripleO::Services::BarbicanBackendKmip - OS::TripleO::Services::BarbicanBackendPkcs11Crypto - OS::TripleO::Services::CACerts - - OS::TripleO::Services::CeilometerApi - - OS::TripleO::Services::CeilometerCollector - - OS::TripleO::Services::CeilometerExpirer - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification - OS::TripleO::Services::CephClient diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 2b0acb5f1e..268167f07a 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -25,9 +25,6 @@ - OS::TripleO::Services::BarbicanApi - OS::TripleO::Services::BarbicanBackendSimpleCrypto - OS::TripleO::Services::CACerts - - OS::TripleO::Services::CeilometerApi - - OS::TripleO::Services::CeilometerCollector - - OS::TripleO::Services::CeilometerExpirer - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification - OS::TripleO::Services::CephExternal diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 5a19b816f6..8f27aee3ff 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -30,9 +30,6 @@ - OS::TripleO::Services::BarbicanBackendKmip - OS::TripleO::Services::BarbicanBackendPkcs11Crypto - OS::TripleO::Services::CACerts - - OS::TripleO::Services::CeilometerApi - - OS::TripleO::Services::CeilometerCollector - - OS::TripleO::Services::CeilometerExpirer - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification - OS::TripleO::Services::CephExternal diff --git a/roles_data.yaml b/roles_data.yaml index 7068dfb123..c2b172da02 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -42,9 +42,6 @@ - OS::TripleO::Services::BarbicanBackendKmip - OS::TripleO::Services::BarbicanBackendPkcs11Crypto - OS::TripleO::Services::CACerts - - OS::TripleO::Services::CeilometerApi - - OS::TripleO::Services::CeilometerCollector - - OS::TripleO::Services::CeilometerExpirer - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification - OS::TripleO::Services::CephExternal diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml index c1ef36b64d..523d22d00c 100644 --- a/sample-env-generator/ssl.yaml +++ b/sample-env-generator/ssl.yaml @@ -115,9 +115,6 @@ environments: BarbicanAdmin: {protocol: 'http', port: '9311', host: 'IP_ADDRESS'} BarbicanInternal: {protocol: 'http', port: '9311', host: 'IP_ADDRESS'} BarbicanPublic: {protocol: 'https', port: '13311', host: 'IP_ADDRESS'} - CeilometerAdmin: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'} - CeilometerInternal: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'} - CeilometerPublic: {protocol: 'https', port: '13777', host: 'IP_ADDRESS'} CephRgwAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'} CephRgwInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'} CephRgwPublic: {protocol: 'https', port: '13808', host: 'IP_ADDRESS'} @@ -231,9 +228,6 @@ environments: BarbicanAdmin: {protocol: 'http', port: '9311', host: 'IP_ADDRESS'} BarbicanInternal: {protocol: 'http', port: '9311', host: 'IP_ADDRESS'} BarbicanPublic: {protocol: 'https', port: '13311', host: 'CLOUDNAME'} - CeilometerAdmin: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'} - CeilometerInternal: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'} - CeilometerPublic: {protocol: 'https', port: '13777', host: 'CLOUDNAME'} CephRgwAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'} CephRgwInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'} CephRgwPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'} @@ -347,9 +341,6 @@ environments: BarbicanAdmin: {protocol: 'https', port: '9311', host: 'CLOUDNAME'} BarbicanInternal: {protocol: 'https', port: '9311', host: 'CLOUDNAME'} BarbicanPublic: {protocol: 'https', port: '13311', host: 'CLOUDNAME'} - CeilometerAdmin: {protocol: 'https', port: '8777', host: 'CLOUDNAME'} - CeilometerInternal: {protocol: 'https', port: '8777', host: 'CLOUDNAME'} - CeilometerPublic: {protocol: 'https', port: '13777', host: 'CLOUDNAME'} CephRgwAdmin: {protocol: 'https', port: '8080', host: 'CLOUDNAME'} CephRgwInternal: {protocol: 'https', port: '8080', host: 'CLOUDNAME'} CephRgwPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'}