From b44a0795781fbed4f8948db1ac1ce545785943ba Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 16 Sep 2019 13:08:18 -0600 Subject: [PATCH] Remove Tacker service The Tacker service has been incomplete since Queens. They restructured the services and TripleO has never implemented code to handle this new structure. Since it's been disabled since Queens and there is currently no plans to fix it, let's remove the service code. Change-Id: I2856e894b58d50c2d3484ccd02bfb1d43625847f Depends-On: https://review.opendev.org/#/c/682457/ Related-Bug: #1714270 --- .../scenario007-multinode-containers.yaml | 6 - ci/environments/scenario007-standalone.yaml | 5 - .../deployed-server-roles-data.yaml | 1 - .../tacker/tacker-container-puppet.yaml | 229 ---------- environments/enable_tacker.yaml | 2 - environments/services-baremetal/tacker.yaml | 2 - environments/services/tacker.yaml | 2 - .../ssl/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/standalone.yaml | 2 - .../standalone/standalone-overcloud.yaml | 1 - .../standalone/standalone-tripleo.yaml | 1 - .../undercloud/undercloud-minion.yaml | 1 - network/endpoints/endpoint_data.yaml | 9 - network/endpoints/endpoint_map.yaml | 393 ------------------ network/service_net_map.j2.yaml | 1 - overcloud-resource-registry-puppet.j2.yaml | 1 - .../notes/remove-tacker-1375cfa1a2ac8fef.yaml | 5 + roles/Controller.yaml | 1 - roles/ControllerAllNovaStandalone.yaml | 1 - roles/ControllerNoCeph.yaml | 1 - roles/ControllerNovaStandalone.yaml | 1 - roles/ControllerOpenstack.yaml | 1 - roles/ControllerStorageDashboard.yaml | 1 - roles/ControllerStorageNfs.yaml | 1 - roles/Standalone.yaml | 1 - roles_data.yaml | 1 - sample-env-generator/ssl.yaml | 12 - sample-env-generator/standalone.yaml | 4 - sample-env-generator/undercloud-minion.yaml | 1 - 32 files changed, 5 insertions(+), 694 deletions(-) delete mode 100644 deployment/tacker/tacker-container-puppet.yaml delete mode 100644 environments/enable_tacker.yaml delete mode 100644 environments/services-baremetal/tacker.yaml delete mode 100644 environments/services/tacker.yaml create mode 100644 releasenotes/notes/remove-tacker-1375cfa1a2ac8fef.yaml diff --git a/ci/environments/scenario007-multinode-containers.yaml b/ci/environments/scenario007-multinode-containers.yaml index cec6a4ca29..258ad1df2c 100644 --- a/ci/environments/scenario007-multinode-containers.yaml +++ b/ci/environments/scenario007-multinode-containers.yaml @@ -22,11 +22,6 @@ resource_registry: OS::TripleO::Services::OVNController: OS::Heat::None OS::TripleO::Services::OVNDBs: OS::Heat::None OS::TripleO::Services::OVNMetadataAgent: OS::Heat::None - # TODO(mandre) fix the tacker service - https://bugs.launchpad.net/tripleo/+bug/1714270 - # OS::TripleO::Services::Tacker: ../../docker/services/tacker.yaml - # TODO tacker still wip https://bugs.launchpad.net/tripleo/+bug/1714270 - # OS::TripleO::Services::Tacker: ../../deployment/tacker/tacker-container-puppet.yaml - OS::TripleO::Services::Tacker: OS::Heat::None # environments/docker-ha.yaml enables the cinder service. So disable cinder services OS::TripleO::Services::CinderVolume: OS::Heat::None OS::TripleO::Services::CinderApi: OS::Heat::None @@ -76,7 +71,6 @@ parameter_defaults: - OS::TripleO::Services::Sshd - OS::TripleO::Services::Iscsid - OS::TripleO::Services::Multipathd - - OS::TripleO::Services::Tacker ControllerExtraConfig: nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu diff --git a/ci/environments/scenario007-standalone.yaml b/ci/environments/scenario007-standalone.yaml index 29a6e41e00..dcfcc55df1 100644 --- a/ci/environments/scenario007-standalone.yaml +++ b/ci/environments/scenario007-standalone.yaml @@ -26,11 +26,6 @@ resource_registry: OS::TripleO::Services::SwiftProxy: OS::Heat::None OS::TripleO::Services::SwiftStorage: OS::Heat::None OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None - # TODO(mandre) fix the tacker service - https://bugs.launchpad.net/tripleo/+bug/1714270 - # OS::TripleO::Services::Tacker: ../../docker/services/tacker.yaml - # TODO tacker still wip https://bugs.launchpad.net/tripleo/+bug/1714270 - # OS::TripleO::Services::Tacker: ../../deployment/tacker/tacker-container-puppet.yaml - OS::TripleO::Services::Tacker: OS::Heat::None parameter_defaults: NeutronMechanismDrivers: ['openvswitch'] NeutronTypeDrivers: 'vxlan,vlan,flat,gre' diff --git a/deployed-server/deployed-server-roles-data.yaml b/deployed-server/deployed-server-roles-data.yaml index d9901329d4..98b8cefbed 100644 --- a/deployed-server/deployed-server-roles-data.yaml +++ b/deployed-server/deployed-server-roles-data.yaml @@ -181,7 +181,6 @@ - OS::TripleO::Services::SwiftDispersion - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::SwiftStorage - - OS::TripleO::Services::Tacker - OS::TripleO::Services::Timesync - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall diff --git a/deployment/tacker/tacker-container-puppet.yaml b/deployment/tacker/tacker-container-puppet.yaml deleted file mode 100644 index 7f61e8ebf6..0000000000 --- a/deployment/tacker/tacker-container-puppet.yaml +++ /dev/null @@ -1,229 +0,0 @@ -heat_template_version: rocky - -description: > - OpenStack containerized Tacker service - -parameters: - ContainerTackerImage: - description: image - type: string - ContainerTackerConfigImage: - description: The container image to use for the tacker config_volume - type: string - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - 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 - TackerPassword: - description: The password for the tacker service account. - type: string - hidden: true - Debug: - type: boolean - default: false - description: Set to True to enable debugging on all services. - TackerDebug: - default: '' - description: Set to True to enable debugging Tacker service. - type: string - constraints: - - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE'] - KeystoneRegion: - type: string - default: 'regionOne' - description: Keystone region for endpoint - TackerPolicies: - description: | - A hash of policies to configure for Tacker. - e.g. { tacker-context_is_admin: { key: context_is_admin, value: 'role:admin' } } - default: {} - type: json - NotificationDriver: - type: string - default: 'messagingv2' - description: Driver or drivers to handle sending notifications. - -conditions: - service_debug_unset: {equals : [{get_param: TackerDebug}, '']} - -resources: - - ContainersCommon: - type: ../containers-common.yaml - - MySQLClient: - type: ../database/mysql-client.yaml - -outputs: - role_data: - description: Role data for the Tacker role. - value: - service_name: tacker - config_settings: - tacker_password: {get_param: TackerPassword} - tacker::db::database_connection: - make_url: - scheme: {get_param: [EndpointMap, MysqlInternal, protocol]} - username: tacker - password: {get_param: TackerPassword} - host: {get_param: [EndpointMap, MysqlInternal, host]} - path: /tacker - query: - read_default_file: /etc/my.cnf.d/tripleo.cnf - read_default_group: tripleo - - tacker::logging::debug: - if: - - service_debug_unset - - {get_param: Debug } - - {get_param: TackerDebug } - tacker::notification_driver: {get_param: NotificationDriver} - tacker::server::bind_host: - str_replace: - template: - "%{hiera('$NETWORK')}" - params: - $NETWORK: {get_param: [ServiceNetMap, TackerApiNetwork]} - tacker::keystone::authtoken::project_name: 'service' - tacker::keystone::authtoken::user_domain_name: 'Default' - tacker::keystone::authtoken::project_domain_name: 'Default' - tacker::keystone::authtoken::password: {get_param: TackerPassword} - tacker::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} - tacker::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} - tacker::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} - - tacker::db::mysql::password: {get_param: TackerPassword} - tacker::db::mysql::user: tacker - tacker::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]} - tacker::db::mysql::dbname: tacker - tacker::db::mysql::allowed_hosts: - - '%' - - {get_param: [EndpointMap, MysqlInternal, host_nobrackets]} - tacker::policy::policies: {get_param: TackerPolicies} - tripleo::tacker::firewall_rules: - '113 tacker': - dport: - - 9890 - - 13989 - service_config_settings: - keystone: - tacker::keystone::auth::tenant: 'service' - tacker::keystone::auth::region: {get_param: KeystoneRegion} - tacker::keystone::auth::password: {get_param: TackerPassword} - tacker::keystone::auth::public_url: {get_param: [EndpointMap, TackerPublic, uri]} - tacker::keystone::auth::internal_url: {get_param: [EndpointMap, TackerInternal, uri]} - tacker::keystone::auth::admin_url: {get_param: [EndpointMap, TackerAdmin, uri]} - # BEGIN DOCKER SETTINGS - puppet_config: - config_volume: tacker - puppet_tags: tacker_config - step_config: - list_join: - - "\n" - - - "include ::tripleo::profile::base::tacker" - - {get_attr: [MySQLClient, role_data, step_config]} - config_image: {get_param: ContainerTackerConfigImage} - kolla_config: - /var/lib/kolla/config_files/tacker_api.json: - command: /usr/bin/tacker-server --config-file=/etc/tacker/tacker.conf --log-file=/var/log/tacker/api.log - config_files: - - source: "/var/lib/kolla/config_files/src/*" - dest: "/" - merge: true - preserve_properties: true - permissions: - - path: /var/log/tacker - owner: tacker:tacker - recurse: true - docker_config: - # db sync runs before permissions set by kolla_config - step_2: - tacker_init_logs: - image: &tacker_image {get_param: ContainerTackerImage} - net: none - privileged: false - user: root - volumes: - - /var/log/containers/tacker:/var/log/tacker - command: ['/bin/bash', '-c', 'chown -R tacker:tacker /var/log/tacker'] - step_3: - tacker_db_sync: - image: *tacker_image - net: host - privileged: false - detach: false - user: root - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - - # FIXME(mandre) mounting /etc rw to workaround LP1696283 - # This should go away anyway and mount the exact files it - # needs or use kolla set_configs.py - - /var/lib/config-data/tacker/etc/:/etc/ - - /var/log/containers/tacker:/var/log/tacker - command: "/usr/bin/bootstrap_host_exec tacker su tacker -s /bin/bash -c 'tacker-db-manage --config-file /etc/tacker/tacker.conf upgrade head'" - step_4: - tacker_api: - image: *tacker_image - net: host - privileged: false - restart: always - healthcheck: - test: /openstack/healthcheck - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/kolla/config_files/tacker_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/tacker/:/var/lib/kolla/config_files/src:ro - - /var/log/containers/tacker:/var/log/tacker - environment: - - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS - host_prep_tasks: - - name: create persistent directories - file: - path: "{{ item.path }}" - state: directory - setype: "{{ item.setype }}" - with_items: - - { 'path': /var/log/tacker, 'setype': svirt_sandbox_file_t } - - { 'path': /var/log/containers/tacker, 'setype': svirt_sandbox_file_t } - - name: tacker logs readme - copy: - dest: /var/log/tacker/readme.txt - content: | - Log files from tacker containers can be found under - /var/log/containers/tacker. - ignore_errors: true - upgrade_tasks: [] - post_upgrade_tasks: - - when: step|int == 1 - import_role: - name: tripleo-docker-rm - vars: - containers_to_rm: - - tacker_api - tripleo_container_cli: "docker" diff --git a/environments/enable_tacker.yaml b/environments/enable_tacker.yaml deleted file mode 100644 index 4e34167ea1..0000000000 --- a/environments/enable_tacker.yaml +++ /dev/null @@ -1,2 +0,0 @@ -resource_registry: - OS::TripleO::Services::Tacker: ../deployment/tacker/tacker-container-puppet.yaml diff --git a/environments/services-baremetal/tacker.yaml b/environments/services-baremetal/tacker.yaml deleted file mode 100644 index d6f9d1f234..0000000000 --- a/environments/services-baremetal/tacker.yaml +++ /dev/null @@ -1,2 +0,0 @@ -resource_registry: - OS::TripleO::Services::Tacker: ../../deployment/tacker/tacker-container-puppet.yaml diff --git a/environments/services/tacker.yaml b/environments/services/tacker.yaml deleted file mode 100644 index d6f9d1f234..0000000000 --- a/environments/services/tacker.yaml +++ /dev/null @@ -1,2 +0,0 @@ -resource_registry: - OS::TripleO::Services::Tacker: ../../deployment/tacker/tacker-container-puppet.yaml diff --git a/environments/ssl/no-tls-endpoints-public-ip.yaml b/environments/ssl/no-tls-endpoints-public-ip.yaml index 1873b3a176..f21662a2e8 100644 --- a/environments/ssl/no-tls-endpoints-public-ip.yaml +++ b/environments/ssl/no-tls-endpoints-public-ip.yaml @@ -97,9 +97,6 @@ parameter_defaults: SwiftInternal: {protocol: http, port: '8080', host: IP_ADDRESS} SwiftPublic: {protocol: http, port: '8080', host: IP_ADDRESS} SwiftUIConfig: {protocol: http, port: '3000', host: IP_ADDRESS} - TackerAdmin: {protocol: http, port: '9890', host: IP_ADDRESS} - TackerInternal: {protocol: http, port: '9890', host: IP_ADDRESS} - TackerPublic: {protocol: http, port: '9890', host: IP_ADDRESS} ZaqarAdmin: {protocol: http, port: '8888', host: IP_ADDRESS} ZaqarInternal: {protocol: http, port: '8888', host: IP_ADDRESS} ZaqarPublic: {protocol: http, port: '8888', host: IP_ADDRESS} diff --git a/environments/ssl/tls-endpoints-public-dns.yaml b/environments/ssl/tls-endpoints-public-dns.yaml index f6a4920303..2c528932b0 100644 --- a/environments/ssl/tls-endpoints-public-dns.yaml +++ b/environments/ssl/tls-endpoints-public-dns.yaml @@ -93,9 +93,6 @@ parameter_defaults: SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'} SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'} SwiftUIConfig: {protocol: 'https', port: '443', host: 'IP_ADDRESS'} - TackerAdmin: {protocol: 'http', port: '9890', host: 'IP_ADDRESS'} - TackerInternal: {protocol: 'http', port: '9890', host: 'IP_ADDRESS'} - TackerPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'} ZaqarAdmin: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'} ZaqarInternal: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'} ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'} diff --git a/environments/ssl/tls-endpoints-public-ip.yaml b/environments/ssl/tls-endpoints-public-ip.yaml index 39b44d077e..e1f39e32cc 100644 --- a/environments/ssl/tls-endpoints-public-ip.yaml +++ b/environments/ssl/tls-endpoints-public-ip.yaml @@ -93,9 +93,6 @@ parameter_defaults: SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'} SwiftPublic: {protocol: 'https', port: '13808', host: 'IP_ADDRESS'} SwiftUIConfig: {protocol: 'https', port: '443', host: 'IP_ADDRESS'} - TackerAdmin: {protocol: 'http', port: '9890', host: 'IP_ADDRESS'} - TackerInternal: {protocol: 'http', port: '9890', host: 'IP_ADDRESS'} - TackerPublic: {protocol: 'https', port: '13989', host: 'IP_ADDRESS'} ZaqarAdmin: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'} ZaqarInternal: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'} ZaqarPublic: {protocol: 'https', port: '13888', host: 'IP_ADDRESS'} diff --git a/environments/ssl/tls-everywhere-endpoints-dns.yaml b/environments/ssl/tls-everywhere-endpoints-dns.yaml index 2996739c1a..b35c4a60b7 100644 --- a/environments/ssl/tls-everywhere-endpoints-dns.yaml +++ b/environments/ssl/tls-everywhere-endpoints-dns.yaml @@ -93,9 +93,6 @@ parameter_defaults: SwiftInternal: {protocol: 'https', port: '8080', host: 'CLOUDNAME'} SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'} SwiftUIConfig: {protocol: 'https', port: '443', host: 'CLOUDNAME'} - TackerAdmin: {protocol: 'https', port: '9890', host: 'CLOUDNAME'} - TackerInternal: {protocol: 'https', port: '9890', host: 'CLOUDNAME'} - TackerPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'} ZaqarAdmin: {protocol: 'https', port: '8888', host: 'CLOUDNAME'} ZaqarInternal: {protocol: 'https', port: '8888', host: 'CLOUDNAME'} ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'} diff --git a/environments/standalone.yaml b/environments/standalone.yaml index 88f570d6df..75b4febb61 100644 --- a/environments/standalone.yaml +++ b/environments/standalone.yaml @@ -81,8 +81,6 @@ resource_registry: # Sahara OS::TripleO::Services::SaharaApi: OS::Heat::None OS::TripleO::Services::SaharaEngine: OS::Heat::None - # Tacker - OS::TripleO::Services::Tacker: OS::Heat::None # Zaqar OS::TripleO::Services::Zaqar: OS::Heat::None diff --git a/environments/standalone/standalone-overcloud.yaml b/environments/standalone/standalone-overcloud.yaml index 9fb74ed814..022762e0e2 100644 --- a/environments/standalone/standalone-overcloud.yaml +++ b/environments/standalone/standalone-overcloud.yaml @@ -95,6 +95,5 @@ resource_registry: OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-puppet.yaml OS::TripleO::Services::SaharaApi: OS::Heat::None OS::TripleO::Services::SaharaEngine: OS::Heat::None - OS::TripleO::Services::Tacker: OS::Heat::None OS::TripleO::Services::Zaqar: OS::Heat::None OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-bridge.yaml diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml index c13482a8b4..ce358c70e2 100644 --- a/environments/standalone/standalone-tripleo.yaml +++ b/environments/standalone/standalone-tripleo.yaml @@ -108,7 +108,6 @@ resource_registry: OS::TripleO::Services::Redis: OS::Heat::None OS::TripleO::Services::SaharaApi: OS::Heat::None OS::TripleO::Services::SaharaEngine: OS::Heat::None - OS::TripleO::Services::Tacker: OS::Heat::None OS::TripleO::Services::Tmpwatch: ../../deployment/logrotate/tmpwatch-install.yaml OS::TripleO::Services::Zaqar: OS::Heat::None OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-standalone.yaml diff --git a/environments/undercloud/undercloud-minion.yaml b/environments/undercloud/undercloud-minion.yaml index 1c83293c6a..683512e619 100644 --- a/environments/undercloud/undercloud-minion.yaml +++ b/environments/undercloud/undercloud-minion.yaml @@ -230,7 +230,6 @@ resource_registry: OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None OS::TripleO::Services::SwiftStorage: OS::Heat::None OS::TripleO::Services::TLSProxyBase: OS::Heat::None - OS::TripleO::Services::Tacker: OS::Heat::None OS::TripleO::Services::Tempest: OS::Heat::None OS::TripleO::Services::Tmpwatch: ../../deployment/logrotate/tmpwatch-install.yaml OS::TripleO::Services::TripleoPackages: OS::Heat::None diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml index 249e6e6169..bc2485d3d1 100644 --- a/network/endpoints/endpoint_data.yaml +++ b/network/endpoints/endpoint_data.yaml @@ -301,15 +301,6 @@ Sahara: net_param: SaharaApi port: 8386 -Tacker: - Internal: - net_param: TackerApi - Public: - net_param: Public - Admin: - net_param: TackerApi - port: 9890 - Ironic: Internal: net_param: IronicApi diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml index 591245c227..7f8af14344 100644 --- a/network/endpoints/endpoint_map.yaml +++ b/network/endpoints/endpoint_map.yaml @@ -343,18 +343,6 @@ parameters: protocol: http port: '3000' host: IP_ADDRESS - TackerAdmin: - protocol: http - port: '9890' - host: IP_ADDRESS - TackerInternal: - protocol: http - port: '9890' - host: IP_ADDRESS - TackerPublic: - protocol: http - port: '9890' - host: IP_ADDRESS ZaqarAdmin: protocol: http port: '8888' @@ -12715,387 +12703,6 @@ outputs: - EndpointMap - SwiftUIConfig - port - TackerAdmin: - host: - str_replace: - template: - get_param: - - EndpointMap - - TackerAdmin - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - TackerApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - TackerApiNetwork - template: NETWORK_uri - host_nobrackets: - str_replace: - template: - get_param: - - EndpointMap - - TackerAdmin - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - TackerApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: - - ServiceNetMap - - TackerApiNetwork - port: - get_param: - - EndpointMap - - TackerAdmin - - port - protocol: - get_param: - - EndpointMap - - TackerAdmin - - protocol - uri: - make_url: - scheme: - get_param: - - EndpointMap - - TackerAdmin - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - TackerAdmin - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - TackerApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - TackerApiNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - TackerAdmin - - port - uri_no_suffix: - make_url: - scheme: - get_param: - - EndpointMap - - TackerAdmin - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - TackerAdmin - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - TackerApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - TackerApiNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - TackerAdmin - - port - TackerInternal: - host: - str_replace: - template: - get_param: - - EndpointMap - - TackerInternal - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - TackerApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - TackerApiNetwork - template: NETWORK_uri - host_nobrackets: - str_replace: - template: - get_param: - - EndpointMap - - TackerInternal - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - TackerApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: - - ServiceNetMap - - TackerApiNetwork - port: - get_param: - - EndpointMap - - TackerInternal - - port - protocol: - get_param: - - EndpointMap - - TackerInternal - - protocol - uri: - make_url: - scheme: - get_param: - - EndpointMap - - TackerInternal - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - TackerInternal - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - TackerApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - TackerApiNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - TackerInternal - - port - uri_no_suffix: - make_url: - scheme: - get_param: - - EndpointMap - - TackerInternal - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - TackerInternal - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - TackerApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - TackerApiNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - TackerInternal - - port - TackerPublic: - host: - str_replace: - template: - get_param: - - EndpointMap - - TackerPublic - - 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 - - TackerPublic - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - PublicNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: - - ServiceNetMap - - PublicNetwork - port: - get_param: - - EndpointMap - - TackerPublic - - port - protocol: - get_param: - - EndpointMap - - TackerPublic - - protocol - uri: - make_url: - scheme: - get_param: - - EndpointMap - - TackerPublic - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - TackerPublic - - 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 - - TackerPublic - - port - uri_no_suffix: - make_url: - scheme: - get_param: - - EndpointMap - - TackerPublic - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - TackerPublic - - 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 - - TackerPublic - - port ZaqarAdmin: host: str_replace: diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml index 9ac0d8869b..8785a766db 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -62,7 +62,6 @@ parameters: NovajoinNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} Ec2ApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} Ec2ApiMetadataNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - TackerApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} SwiftStorageNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }} SwiftProxyNetwork: {{ _service_nets.get('storage', 'ctlplane') }} SaharaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index c4a10c0e5b..ed51a48c6f 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -214,7 +214,6 @@ resource_registry: OS::TripleO::Services::SwiftStorage: deployment/swift/swift-storage-container-puppet.yaml OS::TripleO::Services::SwiftRingBuilder: deployment/swift/swift-ringbuilder-container-puppet.yaml OS::TripleO::Services::Snmp: deployment/snmp/snmp-baremetal-puppet.yaml - OS::TripleO::Services::Tacker: OS::Heat::None OS::TripleO::Services::Timezone: deployment/time/timezone-baremetal-ansible.yaml OS::TripleO::Services::CeilometerAgentCentral: deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml OS::TripleO::Services::CeilometerAgentIpmi: deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml diff --git a/releasenotes/notes/remove-tacker-1375cfa1a2ac8fef.yaml b/releasenotes/notes/remove-tacker-1375cfa1a2ac8fef.yaml new file mode 100644 index 0000000000..579510668c --- /dev/null +++ b/releasenotes/notes/remove-tacker-1375cfa1a2ac8fef.yaml @@ -0,0 +1,5 @@ +--- +other: + - | + Removed Tacker service definitions. The Tacker containers have not been + available since Queens. `bug 1838704 ` diff --git a/roles/Controller.yaml b/roles/Controller.yaml index a55a9f7388..3b641c9749 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -177,7 +177,6 @@ - OS::TripleO::Services::SwiftDispersion - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::SwiftStorage - - OS::TripleO::Services::Tacker - OS::TripleO::Services::Timesync - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index f0f3466dd4..c4a0ba0cad 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/roles/ControllerAllNovaStandalone.yaml @@ -127,7 +127,6 @@ - OS::TripleO::Services::SwiftDispersion - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::SwiftStorage - - OS::TripleO::Services::Tacker - OS::TripleO::Services::Timesync - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index 3481e3109d..bd8512073f 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -169,7 +169,6 @@ - OS::TripleO::Services::SwiftDispersion - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::SwiftStorage - - OS::TripleO::Services::Tacker - OS::TripleO::Services::Timesync - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 111d7dc13e..66a2d1fc1a 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -145,7 +145,6 @@ - OS::TripleO::Services::SwiftDispersion - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::SwiftStorage - - OS::TripleO::Services::Tacker - OS::TripleO::Services::Timesync - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 27a8fe3e71..6730bedfba 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -141,7 +141,6 @@ - OS::TripleO::Services::SwiftDispersion - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::SwiftStorage - - OS::TripleO::Services::Tacker - OS::TripleO::Services::Timesync - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml index be42de9be3..28f108c91a 100644 --- a/roles/ControllerStorageDashboard.yaml +++ b/roles/ControllerStorageDashboard.yaml @@ -179,7 +179,6 @@ - OS::TripleO::Services::SwiftDispersion - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::SwiftStorage - - OS::TripleO::Services::Tacker - OS::TripleO::Services::Timesync - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 83be2d5f3b..8e79d9ef15 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -178,7 +178,6 @@ - OS::TripleO::Services::SwiftDispersion - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::SwiftStorage - - OS::TripleO::Services::Tacker - OS::TripleO::Services::Timesync - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index 4f94d9a693..a1ded40b79 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -177,7 +177,6 @@ - OS::TripleO::Services::SwiftProxy - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::SwiftStorage - - OS::TripleO::Services::Tacker - OS::TripleO::Services::Timesync - OS::TripleO::Services::Timezone - OS::TripleO::Services::Tmpwatch diff --git a/roles_data.yaml b/roles_data.yaml index e82c225301..68563c149c 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -180,7 +180,6 @@ - OS::TripleO::Services::SwiftDispersion - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::SwiftStorage - - OS::TripleO::Services::Tacker - OS::TripleO::Services::Timesync - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml index 59d0921f40..dfd7289b84 100644 --- a/sample-env-generator/ssl.yaml +++ b/sample-env-generator/ssl.yaml @@ -201,9 +201,6 @@ environments: SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'} SwiftPublic: {protocol: 'https', port: '13808', host: 'IP_ADDRESS'} SwiftUIConfig: {protocol: 'https', port: '443', host: 'IP_ADDRESS'} - TackerAdmin: {protocol: 'http', port: '9890', host: 'IP_ADDRESS'} - TackerInternal: {protocol: 'http', port: '9890', host: 'IP_ADDRESS'} - TackerPublic: {protocol: 'https', port: '13989', host: 'IP_ADDRESS'} ZaqarAdmin: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'} ZaqarInternal: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'} ZaqarPublic: {protocol: 'https', port: '13888', host: 'IP_ADDRESS'} @@ -310,9 +307,6 @@ environments: SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'} SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'} SwiftUIConfig: {protocol: 'https', port: '443', host: 'IP_ADDRESS'} - TackerAdmin: {protocol: 'http', port: '9890', host: 'IP_ADDRESS'} - TackerInternal: {protocol: 'http', port: '9890', host: 'IP_ADDRESS'} - TackerPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'} ZaqarAdmin: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'} ZaqarInternal: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'} ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'} @@ -419,9 +413,6 @@ environments: SwiftInternal: {protocol: 'https', port: '8080', host: 'CLOUDNAME'} SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'} SwiftUIConfig: {protocol: 'https', port: '443', host: 'CLOUDNAME'} - TackerAdmin: {protocol: 'https', port: '9890', host: 'CLOUDNAME'} - TackerInternal: {protocol: 'https', port: '9890', host: 'CLOUDNAME'} - TackerPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'} ZaqarAdmin: {protocol: 'https', port: '8888', host: 'CLOUDNAME'} ZaqarInternal: {protocol: 'https', port: '8888', host: 'CLOUDNAME'} ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'} @@ -538,9 +529,6 @@ environments: SwiftInternal: {protocol: http, port: '8080', host: IP_ADDRESS} SwiftPublic: {protocol: http, port: '8080', host: IP_ADDRESS} SwiftUIConfig: {protocol: http, port: '3000', host: IP_ADDRESS} - TackerAdmin: {protocol: http, port: '9890', host: IP_ADDRESS} - TackerInternal: {protocol: http, port: '9890', host: IP_ADDRESS} - TackerPublic: {protocol: http, port: '9890', host: IP_ADDRESS} ZaqarAdmin: {protocol: http, port: '8888', host: IP_ADDRESS} ZaqarInternal: {protocol: http, port: '8888', host: IP_ADDRESS} ZaqarPublic: {protocol: http, port: '8888', host: IP_ADDRESS} diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml index db1f2ef2af..1e9ade9e7c 100644 --- a/sample-env-generator/standalone.yaml +++ b/sample-env-generator/standalone.yaml @@ -134,8 +134,6 @@ environments: # Sahara OS::TripleO::Services::SaharaApi: OS::Heat::None OS::TripleO::Services::SaharaEngine: OS::Heat::None - # Tacker - OS::TripleO::Services::Tacker: OS::Heat::None # Zaqar OS::TripleO::Services::Zaqar: OS::Heat::None @@ -244,8 +242,6 @@ environments: # Sahara OS::TripleO::Services::SaharaApi: OS::Heat::None OS::TripleO::Services::SaharaEngine: OS::Heat::None - # Tacker - OS::TripleO::Services::Tacker: OS::Heat::None # Zaqar OS::TripleO::Services::Zaqar: OS::Heat::None diff --git a/sample-env-generator/undercloud-minion.yaml b/sample-env-generator/undercloud-minion.yaml index 6139d1a7b7..69310458e3 100644 --- a/sample-env-generator/undercloud-minion.yaml +++ b/sample-env-generator/undercloud-minion.yaml @@ -251,7 +251,6 @@ environments: OS::TripleO::Services::SwiftProxy: OS::Heat::None OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None OS::TripleO::Services::SwiftStorage: OS::Heat::None - OS::TripleO::Services::Tacker: OS::Heat::None OS::TripleO::Services::Tempest: OS::Heat::None OS::TripleO::Services::TLSProxyBase: OS::Heat::None OS::TripleO::Services::TripleoPackages: OS::Heat::None