From 7f7287cc92a24e38dd14372052ba303d48577c24 Mon Sep 17 00:00:00 2001 From: gugug Date: Fri, 29 May 2020 22:13:10 +0800 Subject: [PATCH] Remove retired congress Congress has been retired, remove the congress chart See https://review.opendev.org/721742 Change-Id: Ief1952d0b3455ba117216c88552469e4d68a21e8 --- openstack/loci/build-newton.sh | 4 +--- openstack/loci/build-rocky.sh | 1 - openstack/loci/build-stein.sh | 1 - openstack/loci/build-train.sh | 1 - openstack/loci/build.sh | 4 +--- .../exporter/check_os_api.py | 1 - zuul.d/openstack-loci.yaml | 23 ------------------- 7 files changed, 2 insertions(+), 33 deletions(-) diff --git a/openstack/loci/build-newton.sh b/openstack/loci/build-newton.sh index 7ad58cd0..82972de4 100755 --- a/openstack/loci/build-newton.sh +++ b/openstack/loci/build-newton.sh @@ -26,8 +26,6 @@ horizon_profiles=${horizon_profiles:-"'horizon apache'"} horizon_pip_packages=${horizon_pip_packages:-"pycrypto"} senlin_profiles=${senlin_profiles:-"'senlin'"} senlin_pip_packages=${senlin_pip_packages:-"pycrypto"} -congress_profiles=${congress_profiles:-"'congress'"} -congress_pip_packages=${congress_pip_packages:-"'pycrypto python-congressclient'"} magnum_profiles=${magnum_profiles:-"'magnum'"} magnum_pip_packages=${magnum_pip_packages:-"pycrypto"} ironic_profiles=${ironic_profiles:-"'ironic ipxe ipmi qemu tftp'"} @@ -39,6 +37,6 @@ neutron_sriov_profiles=${neutron_sriov_profiles:-"'neutron linuxbridge openvswit neutron_sriov_pip_packages=${neutron_sriov_pip_packages:-"pycrypto"} neutron_sriov_dist_packages=${neutron_sriov_dist_packages:-"'ethtool lshw'"} neutron_sriov_extra_tag=${neutron_sriov_extra_tag:-'-sriov-1804'} -BUILD_PROJECTS=${BUILD_PROJECTS:-'requirements keystone heat barbican glance cinder neutron neutron_sriov nova horizon senlin congress magnum ironic'} +BUILD_PROJECTS=${BUILD_PROJECTS:-'requirements keystone heat barbican glance cinder neutron neutron_sriov nova horizon senlin magnum ironic'} source ${SCRIPT_DIR}/build.sh diff --git a/openstack/loci/build-rocky.sh b/openstack/loci/build-rocky.sh index d09165a7..c4a99a1f 100755 --- a/openstack/loci/build-rocky.sh +++ b/openstack/loci/build-rocky.sh @@ -17,7 +17,6 @@ neutron_pip_packages=${neutron_pip_packages:-"''"} nova_pip_packages=${nova_pip_packages:-"''"} horizon_pip_packages=${horizon_pip_packages:-"''"} senlin_pip_packages=${senlin_pip_packages:-"''"} -congress_pip_packages=${congress_pip_packages:-"'python-congressclient'"} magnum_pip_packages=${magnum_pip_packages:-"''"} ironic_pip_packages=${ironic_pip_packages:-"''"} neutron_sriov_pip_packages=${neutron_sriov_pip_packages:-"''"} diff --git a/openstack/loci/build-stein.sh b/openstack/loci/build-stein.sh index f752e137..b397f9d5 100755 --- a/openstack/loci/build-stein.sh +++ b/openstack/loci/build-stein.sh @@ -17,7 +17,6 @@ neutron_pip_packages=${neutron_pip_packages:-"''"} nova_pip_packages=${nova_pip_packages:-"''"} horizon_pip_packages=${horizon_pip_packages:-"''"} senlin_pip_packages=${senlin_pip_packages:-"''"} -congress_pip_packages=${congress_pip_packages:-"'python-congressclient'"} magnum_pip_packages=${magnum_pip_packages:-"''"} ironic_pip_packages=${ironic_pip_packages:-"''"} neutron_sriov_pip_packages=${neutron_sriov_pip_packages:-"''"} diff --git a/openstack/loci/build-train.sh b/openstack/loci/build-train.sh index 989afc72..00f27218 100755 --- a/openstack/loci/build-train.sh +++ b/openstack/loci/build-train.sh @@ -17,7 +17,6 @@ neutron_pip_packages=${neutron_pip_packages:-"''"} nova_pip_packages=${nova_pip_packages:-"''"} horizon_pip_packages=${horizon_pip_packages:-"''"} senlin_pip_packages=${senlin_pip_packages:-"''"} -congress_pip_packages=${congress_pip_packages:-"'python-congressclient'"} magnum_pip_packages=${magnum_pip_packages:-"''"} ironic_pip_packages=${ironic_pip_packages:-"''"} neutron_sriov_pip_packages=${neutron_sriov_pip_packages:-"''"} diff --git a/openstack/loci/build.sh b/openstack/loci/build.sh index 517c2a91..ac273103 100755 --- a/openstack/loci/build.sh +++ b/openstack/loci/build.sh @@ -202,8 +202,6 @@ horizon_profiles=${horizon_profiles:-"'fluent apache'"} horizon_pip_packages=${horizon_pip_packages:-"pycrypto"} senlin_profiles=${senlin_profiles:-"fluent"} senlin_pip_packages=${senlin_pip_packages:-"pycrypto"} -congress_profiles=${congress_profiles:-"fluent"} -congress_pip_packages=${congress_pip_packages:-"'pycrypto python-congressclient'"} magnum_profiles=${magnum_profiles:-"fluent"} magnum_pip_packages=${magnum_pip_packages:-"pycrypto"} ironic_profiles=${ironic_profiles:-"'fluent ipxe ipmi qemu tftp'"} @@ -265,7 +263,7 @@ else LOCI_ARG_FROM="${BASE_IMAGE}" fi -BUILD_PROJECTS=${BUILD_PROJECTS:-'requirements keystone heat barbican glance cinder neutron neutron_sriov nova horizon senlin congress magnum ironic'} +BUILD_PROJECTS=${BUILD_PROJECTS:-'requirements keystone heat barbican glance cinder neutron neutron_sriov nova horizon senlin magnum ironic'} projects=( ${BUILD_PROJECTS} ) pushd ${LOCI_SRC_DIR} diff --git a/prometheus-openstack-exporter/exporter/check_os_api.py b/prometheus-openstack-exporter/exporter/check_os_api.py index ff7b80ff..ff96b07e 100644 --- a/prometheus-openstack-exporter/exporter/check_os_api.py +++ b/prometheus-openstack-exporter/exporter/check_os_api.py @@ -44,7 +44,6 @@ class CheckOSApi(OSBase): 'designate': {'path': '/', 'expect': [200, 300], 'name': 'designate-api'}, 'contrail_analytics': {'path': '/', 'expect': [200], 'name': 'contrail-analytics-api'}, 'contrail_config': {'path': '/', 'expect': [200], 'name': 'contrail-config-api'}, - 'congress': {'path': '/', 'expect': [200], 'name': 'congress-api'}, 'placement': {'path': '/', 'expect': [401], 'name': 'placement-api'}, 'shipyard': {'path': 'api/v1.0/health', 'expect': [204, 503], 'name': 'shipyard'}, 'armada': {'path': 'api/v1.0/health', 'expect': [204, 503], 'name': 'armada'}, diff --git a/zuul.d/openstack-loci.yaml b/zuul.d/openstack-loci.yaml index d84f197a..e386462d 100644 --- a/zuul.d/openstack-loci.yaml +++ b/zuul.d/openstack-loci.yaml @@ -239,18 +239,6 @@ - "PROFILES='fluent'" - "WHEELS='{{ wheels_location }}'" tags: *imagetag - - &congress_project - context: "." - repository: openstackhelm/congress - build_args: - - "FROM='{{ base_repository }}'" - - "PYTHON3={{ python3 }}" - - "PROJECT='congress'" - - "PROJECT_REF={{ branchname }}" - - "PROFILES='fluent'" - - "PIP_PACKAGES='python-congressclient'" - - "WHEELS='{{ wheels_location }}'" - tags: *imagetag - &magnum_project context: "." repository: openstackhelm/magnum @@ -832,17 +820,6 @@ - "PIP_PACKAGES='pycrypto'" - "WHEELS='{{ wheels_location }}'" tags: *imagetag - - context: "." - repository: openstackhelm/congress - build_args: - - "FROM='{{ base_repository }}'" - - "PYTHON3={{ python3 }}" - - "PROJECT='congress'" - - "PROJECT_REF={{ branchname }}" - - "PROFILES='fluent'" - - "PIP_PACKAGES='pycrypto python-congressclient'" - - "WHEELS='{{ wheels_location }}'" - tags: *imagetag - context: "." repository: openstackhelm/magnum build_args: