Drop upgrade step for Octavia certificates

With migration to PKI role for Octavia in Yoga, we added upgrade
playbook to define certificates for users that are upgrading deployment.

With SLURP releases, we either need to drop this upgrade step now or
carry on until Antelope.

Change-Id: I2c72bf6324b443c6b01a7f3142ebc90768c1c9c8

doc/source/admin/upgrades/major-upgrades.rst

@@ -151,12 +151,6 @@ Please review the contents of the playbook for more information.
 
     # openstack-ansible "${SCRIPTS_PATH}/upgrade-utilities/deploy-config-changes.yml"
 
-Update user_variables to set overrides for the location of any existing
-Ocatavia certificates.
-
-.. code-block:: console
-
-    # openstack-ansible "${SCRIPTS_PATH}/upgrade-utilities/define-octavia-certificate-vars.yml"
 
 Upgrade hosts
 ~~~~~~~~~~~~~

scripts/run-upgrade.sh

@@ -175,7 +175,6 @@ function main {
 
     pushd ${MAIN_PATH}/playbooks
         RUN_TASKS+=("${SCRIPTS_PATH}/upgrade-utilities/deploy-config-changes.yml")
-        RUN_TASKS+=("${SCRIPTS_PATH}/upgrade-utilities/define-octavia-certificate-vars.yml")
         RUN_TASKS+=("certificate-ssh-authority.yml")
         # we don't want to trigger container restarts for galera and rabbit
         # but as there will be no hosts available for metal deployments,

scripts/upgrade-utilities/define-octavia-certificate-vars.yml

@@ -1,40 +0,0 @@
----
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Prepare environment and configuration for deploying the new release
-  hosts: localhost
-  connection: local
-  gather_facts: false
-  user: root
-  vars:
-    generated_octavia_cert_dir: "{{ octavia_cert_dir | default(lookup('env', 'HOME') ~ '/openstack-ansible/octavia') }}"
-    generated_octavia_cert_setup_host: "{{ octavia_cert_setup_host | default('localhost') }}"
-    generated_octavia_cert_vars:
-      octavia_client_ca: "{{ octavia_client_ca | default(generated_octavia_cert_dir ~ '/ca_01.pem') }}"
-      octavia_client_cert: "{{ octavia_client_cert | default(generated_octavia_cert_dir ~ '/client.pem') }}"
-      octavia_client_key: "{{ octavia_client_key | default(generated_octavia_cert_dir ~ '/client.key') }}"
-      octavia_ca_certificate: "{{ octavia_ca_certificate | default(generated_octavia_cert_dir ~ '/ca_server_01.pem') }}"
-      octavia_ca_private_key: "{{ octavia_ca_private_key | default(generated_octavia_cert_dir ~ '/private/cakey.pem') }}"
-      octavia_server_ca: "{{ octavia_server_ca | default(generated_octavia_cert_dir ~ '/ca_server_01.pem') }}"
-
-  tasks:
-
-    - name: Place overrides for Octavia Amphora certificates
-      blockinfile:
-        marker: "### {mark} Yoga upgrade migration block ###"
-        path: "{{ openstack_config_dir }}/user_octavia_migration.yml"
-        block: "{{ generated_octavia_cert_vars | to_nice_yaml }}"
-        create: True
-      when:
-        - "'octavia_all' in groups"
-        - groups['octavia_all'] | length > 0