From 62d71bae1e1192ab598712feb93fafe344a4d04e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 27 Apr 2022 11:35:59 +0900 Subject: [PATCH] Remove implementations for novajoin support ... because support for the novajoin service was already removed[1]. Depends-on: https://review.opendev.org/833508 Change-Id: I54f739c396b29d6a84b4ed5d7fcad364910d3abc --- container-images/kolla/base/uid_gid_manage.sh | 1 - .../tcib/base/os/nova-base/nova-api/nova-api.yaml | 1 - .../nova-compute-ironic/nova-compute-ironic.yaml | 1 - .../tcib/base/os/novajoin-base/novajoin-base.yaml | 6 ------ .../novajoin-notifier/novajoin-notifier.yaml | 2 -- .../novajoin-server/novajoin-server.yaml | 2 -- container-images/tripleo_containers.yaml | 4 ---- container-images/tripleo_containers.yaml.j2 | 15 --------------- tripleo_common/constants.py | 2 -- tripleo_common/tests/utils/test_plan.py | 1 - 10 files changed, 35 deletions(-) delete mode 100644 container-images/tcib/base/os/novajoin-base/novajoin-base.yaml delete mode 100644 container-images/tcib/base/os/novajoin-base/novajoin-notifier/novajoin-notifier.yaml delete mode 100644 container-images/tcib/base/os/novajoin-base/novajoin-server/novajoin-server.yaml diff --git a/container-images/kolla/base/uid_gid_manage.sh b/container-images/kolla/base/uid_gid_manage.sh index 0c5271fe2..086d24239 100755 --- a/container-images/kolla/base/uid_gid_manage.sh +++ b/container-images/kolla/base/uid_gid_manage.sh @@ -60,7 +60,6 @@ _SUPPORTED_USERS['mysql']='mysql 42434 42434 /var/lib/mysql kolla' _SUPPORTED_USERS['neutron']='neutron 42435 42435 /var/lib/neutron kolla' _SUPPORTED_USERS['nfast']='nfast 42481 42481' _SUPPORTED_USERS['nova']='nova 42436 42436 /var/lib/nova qemu,libvirt,kolla' -_SUPPORTED_USERS['novajoin']='novajoin 42470 42470 /var/lib/novajoin kolla' _SUPPORTED_USERS['octavia']='octavia 42437 42437 /var/lib/octavia kolla' _SUPPORTED_USERS['openvswitch']='openvswitch 42476 42476' _SUPPORTED_USERS['ovn-bgp']='ovn-bgp 42486 42486 /var/lib/ovn-bgp kolla' diff --git a/container-images/tcib/base/os/nova-base/nova-api/nova-api.yaml b/container-images/tcib/base/os/nova-base/nova-api/nova-api.yaml index cfb418e4d..f9a3501b9 100644 --- a/container-images/tcib/base/os/nova-base/nova-api/nova-api.yaml +++ b/container-images/tcib/base/os/nova-base/nova-api/nova-api.yaml @@ -8,5 +8,4 @@ tcib_packages: - mod_ssl - openstack-nova-api - python3-mod_wsgi - - python3-novajoin tcib_user: nova diff --git a/container-images/tcib/base/os/nova-base/nova-compute-ironic/nova-compute-ironic.yaml b/container-images/tcib/base/os/nova-base/nova-compute-ironic/nova-compute-ironic.yaml index 053565469..577e621f5 100644 --- a/container-images/tcib/base/os/nova-base/nova-compute-ironic/nova-compute-ironic.yaml +++ b/container-images/tcib/base/os/nova-base/nova-compute-ironic/nova-compute-ironic.yaml @@ -8,5 +8,4 @@ tcib_packages: - xorriso - nvme-cli - openstack-nova-compute - - python3-novajoin tcib_user: nova diff --git a/container-images/tcib/base/os/novajoin-base/novajoin-base.yaml b/container-images/tcib/base/os/novajoin-base/novajoin-base.yaml deleted file mode 100644 index 1f2679a73..000000000 --- a/container-images/tcib/base/os/novajoin-base/novajoin-base.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tcib_actions: -- run: bash /usr/local/bin/uid_gid_manage novajoin -- run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf -tcib_packages: - common: - - python3-novajoin diff --git a/container-images/tcib/base/os/novajoin-base/novajoin-notifier/novajoin-notifier.yaml b/container-images/tcib/base/os/novajoin-base/novajoin-notifier/novajoin-notifier.yaml deleted file mode 100644 index 25cfc714f..000000000 --- a/container-images/tcib/base/os/novajoin-base/novajoin-notifier/novajoin-notifier.yaml +++ /dev/null @@ -1,2 +0,0 @@ -tcib_actions: -- run: mkdir -p /novajoin-notifier \ No newline at end of file diff --git a/container-images/tcib/base/os/novajoin-base/novajoin-server/novajoin-server.yaml b/container-images/tcib/base/os/novajoin-base/novajoin-server/novajoin-server.yaml deleted file mode 100644 index 86c32376b..000000000 --- a/container-images/tcib/base/os/novajoin-base/novajoin-server/novajoin-server.yaml +++ /dev/null @@ -1,2 +0,0 @@ -tcib_actions: -- run: mkdir -p /novajoin-server \ No newline at end of file diff --git a/container-images/tripleo_containers.yaml b/container-images/tripleo_containers.yaml index 47a9a28c4..faff207f1 100644 --- a/container-images/tripleo_containers.yaml +++ b/container-images/tripleo_containers.yaml @@ -133,10 +133,6 @@ container_images: image_source: tripleo - imagename: quay.io/tripleomastercentos9/openstack-nova-scheduler:current-tripleo image_source: tripleo -- imagename: quay.io/tripleomastercentos9/openstack-novajoin-notifier:current-tripleo - image_source: tripleo -- imagename: quay.io/tripleomastercentos9/openstack-novajoin-server:current-tripleo - image_source: tripleo - imagename: quay.io/tripleomastercentos9/openstack-octavia-api:current-tripleo image_source: tripleo - imagename: quay.io/tripleomastercentos9/openstack-octavia-health-manager:current-tripleo diff --git a/container-images/tripleo_containers.yaml.j2 b/container-images/tripleo_containers.yaml.j2 index f800a197d..d805be472 100644 --- a/container-images/tripleo_containers.yaml.j2 +++ b/container-images/tripleo_containers.yaml.j2 @@ -582,21 +582,6 @@ container_images_template: services: - OS::TripleO::Services::NovaScheduler -- imagename: "{{namespace}}/{{name_prefix}}novajoin-notifier{{name_suffix}}:{{tag}}" - image_source: tripleo - params: - - ContainerNovajoinNotifierImage - services: - - OS::TripleO::Services::Novajoin - -- imagename: "{{namespace}}/{{name_prefix}}novajoin-server{{name_suffix}}:{{tag}}" - image_source: tripleo - params: - - ContainerNovajoinServerImage - - ContainerNovajoinConfigImage - services: - - OS::TripleO::Services::Novajoin - - imagename: "{{namespace}}/{{name_prefix}}octavia-api{{name_suffix}}:{{tag}}" image_source: tripleo params: diff --git a/tripleo_common/constants.py b/tripleo_common/constants.py index c0307a9dc..3c9fad407 100644 --- a/tripleo_common/constants.py +++ b/tripleo_common/constants.py @@ -72,7 +72,6 @@ PASSWORD_PARAMETER_NAMES = ( 'NeutronMetadataProxySharedSecret', 'NeutronPassword', 'NovaPassword', - 'NovajoinPassword', 'MigrationSshKey', 'OctaviaServerCertsKeyPassphrase', 'OctaviaCaKeyPassphrase', @@ -111,7 +110,6 @@ DB_PASSWORD_PARAMETER_NAMES = ( 'MysqlRootPassword', 'NeutronPassword', 'NovaPassword', - 'NovajoinPassword', 'OctaviaPassword', 'PlacementPassword', ) diff --git a/tripleo_common/tests/utils/test_plan.py b/tripleo_common/tests/utils/test_plan.py index 204e079bd..19655fc9c 100644 --- a/tripleo_common/tests/utils/test_plan.py +++ b/tripleo_common/tests/utils/test_plan.py @@ -84,7 +84,6 @@ _EXISTING_PASSWORDS = { 'HeatAuthEncryptionKey': '9xZXehsKc2HbmFFMKjuqxTJHn', 'PcsdPassword': 'KjEzeitus8eu751a', 'HorizonSecret': 'mjEzeitus8eu751B', - 'NovajoinPassword': '7dZATgVPwD7Ergs9kTTDMCr7F', 'IronicPassword': '4hFDgn9ANeVfuqk84pHpD4ksa', 'RedisPassword': 'xjj3QZDcUQmU6Q7NzWBHRUhGd', 'CinderPassword': 'dcxC3xyUcrmvzfrrxpAd3REcm',