diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index 2039af0860..0a23c1ce7a 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -21,7 +21,6 @@ resource_registry: OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml OS::TripleO::Services::CinderBackup: ../../deployment/cinder/cinder-backup-pacemaker-puppet.yaml OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml - OS::TripleO::Services::Keepalived: OS::Heat::None OS::TripleO::Services::HeatApi: ../../deployment/heat/heat-api-container-puppet.yaml OS::TripleO::Services::HeatApiCfn: ../../deployment/heat/heat-api-cfn-container-puppet.yaml OS::TripleO::Services::HeatApiCloudwatch: ../../deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml diff --git a/ci/environments/scenario013-standalone.yaml b/ci/environments/scenario013-standalone.yaml index 1d643249de..77722d2369 100644 --- a/ci/environments/scenario013-standalone.yaml +++ b/ci/environments/scenario013-standalone.yaml @@ -5,7 +5,6 @@ resource_registry: OS::TripleO::Services::CinderScheduler: OS::Heat::None OS::TripleO::Services::CinderVolume: OS::Heat::None OS::TripleO::Services::Horizon: OS::Heat::None - OS::TripleO::Services::Keepalived: OS::Heat::None OS::TripleO::Services::OctaviaApi: ../../deployment/octavia/octavia-api-container-puppet.yaml OS::TripleO::Services::OctaviaDeploymentConfig: ../../deployment/octavia/octavia-deployment-config.yaml OS::TripleO::Services::OctaviaHealthManager: ../../deployment/octavia/octavia-health-manager-container-puppet.yaml diff --git a/deployment/deprecated/keepalived/keepalived-container-puppet.yaml b/deployment/deprecated/keepalived/keepalived-container-puppet.yaml deleted file mode 100644 index fa5ac05af0..0000000000 --- a/deployment/deprecated/keepalived/keepalived-container-puppet.yaml +++ /dev/null @@ -1,153 +0,0 @@ -heat_template_version: wallaby - -description: > - DEPRECATED - OpenStack containerized Keepalived service - -parameters: - ContainerKeepalivedImage: - description: image - type: string - ContainerKeepalivedConfigImage: - description: The container image to use for the keepalived 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 - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - ControlVirtualInterface: - default: '' - description: > - Interface where virtual ip will be assigned. This value will be - automatically set by the deployment tool. Overriding here will - override automatic setting. - type: string - PublicVirtualInterface: - default: '' - description: > - Interface where virtual ip will be assigned. This value will be - automatically set by the deployment tool. Overriding here will - override automatic setting. - type: string - MonitoringSubscriptionKeepalived: - default: 'overcloud-keepalived' - type: string - # DEPRECATED: the following options are deprecated and are currently maintained - # for backwards compatibility. They will be removed in future release. - KeepalivedRestart: - default: false - description: Whether or not restart Keepalived. Deprecated and no effect. - type: boolean - -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: - - KeepalivedRestart - -conditions: - control_iface_empty: {equals : [{get_param: ControlVirtualInterface}, '']} - public_iface_empty: {equals : [{get_param: PublicVirtualInterface}, '']} - -resources: - ContainersCommon: - type: ../../containers-common.yaml - -outputs: - role_data: - description: Role data for the Keepalived role. - value: - service_name: keepalived - firewall_rules: - '106 keepalived vrrp': - proto: vrrp - monitoring_subscription: {get_param: MonitoringSubscriptionKeepalived} - config_settings: - map_merge: - - tripleo::keepalived:custom_vrrp_script: 'test -S /var/lib/haproxy/stats && echo "show info" | socat /var/lib/haproxy/stats stdio' - - - if: - - control_iface_empty - - {} - - tripleo::keepalived::control_virtual_interface: {get_param: ControlVirtualInterface} - - - if: - - public_iface_empty - - {} - - tripleo::keepalived::public_virtual_interface: {get_param: PublicVirtualInterface} - service_config_settings: {} - # BEGIN DOCKER SETTINGS - puppet_config: - config_volume: 'keepalived' - puppet_tags: 'file' - step_config: | - include tripleo::profile::base::keepalived - config_image: {get_param: ContainerKeepalivedConfigImage} - kolla_config: - /var/lib/kolla/config_files/keepalived.json: - command: "/bin/bash -c $* -- eval exec /usr/sbin/keepalived -nldD &>>/var/log/keepalived.log" - config_files: - - source: "/var/lib/kolla/config_files/src/*" - dest: "/" - merge: true - preserve_properties: true - docker_config: - step_1: - keepalived: - start_order: 0 - image: {get_param: ContainerKeepalivedImage} - net: host - privileged: true - restart: always - # FIXME: needs to be added to the container first - #healthcheck: - #test: /openstack/healthcheck - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/kolla/config_files/keepalived.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/keepalived:/var/lib/kolla/config_files/src:ro - - /var/log/containers/keepalived/:/var/log/:z - - /lib/modules/:/lib/modules/:ro - - /var/lib/haproxy/:/var/lib/haproxy/:z - environment: - KOLLA_CONFIG_STRATEGY: COPY_ALWAYS - command: /usr/local/bin/kolla_start - host_prep_tasks: - - name: load ip_vs module - import_role: - name: tripleo_module_load - vars: - modules: - - name: ip_vs - - name: create persistent directories - file: - path: "{{ item.path }}" - state: directory - setype: "{{ item.setype }}" - mode: "{{ item.mode }}" - with_items: - - { 'path': /var/log/containers/keepalived, 'setype': container_file_t, 'mode': '0750' } diff --git a/deployment/undercloud/undercloud-upgrade.yaml b/deployment/undercloud/undercloud-upgrade.yaml index 53fef5e82c..1e6a84be48 100644 --- a/deployment/undercloud/undercloud-upgrade.yaml +++ b/deployment/undercloud/undercloud-upgrade.yaml @@ -123,7 +123,7 @@ outputs: failed_when: - ironic_inspector_migrate_data_result.rc is defined # do not fail in dry run mode - ironic_inspector_migrate_data_result.rc not in [0, 125] # ignore if container not running - # Keepalived was deprecated and the VIPs are now deployed by + # Keepalived was removed and the VIPs are now deployed by # os-net-config. # When Keepalived is stopped, it brings down the VIPs which is # problematic since it'll remove the resources created by os-net-config diff --git a/environments/services/undercloud-keepalived.yaml b/environments/services/undercloud-keepalived.yaml deleted file mode 100644 index cf7ddc8d01..0000000000 --- a/environments/services/undercloud-keepalived.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# DEPRECATED. This file will be removed in the U release as it is no longer -# needed -resource_registry: - OS::TripleO::Services::Keepalived: ../../deployment/deprecated/keepalived/keepalived-container-puppet.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 57940117e4..89ae147688 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -173,7 +173,6 @@ resource_registry: OS::TripleO::Services::HAProxyPublicTLS: deployment/haproxy/haproxy-public-tls-inject.yaml OS::TripleO::Services::HAProxyInternalTLS: OS::Heat::None OS::TripleO::Services::Iscsid: deployment/iscsid/iscsid-container-puppet.yaml - OS::TripleO::Services::Keepalived: OS::Heat::None OS::TripleO::Services::Memcached: deployment/memcached/memcached-container-puppet.yaml OS::TripleO::Services::Tuned: deployment/tuned/tuned-baremetal-ansible.yaml OS::TripleO::Services::Securetty: OS::Heat::None diff --git a/releasenotes/notes/keepalived_removed-04c52519d7b33acb.yaml b/releasenotes/notes/keepalived_removed-04c52519d7b33acb.yaml new file mode 100644 index 0000000000..c1bd743ed2 --- /dev/null +++ b/releasenotes/notes/keepalived_removed-04c52519d7b33acb.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + The Keepalived service has been removed. + The ``OS::Tripleo::Service::Keepalived`` resource should be removed during + update/upgrade.