openstack
/
openstack-helm-images
Code Issues Proposed changes

Merge "Remove retired congress"

This commit is contained in:
Zuul 2020-06-01 17:54:28 +00:00 committed by Gerrit Code Review
parent e1b1d7b152 7f7287cc92
commit 160aeb335f
7 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack/loci/build-newton.sh
View File

@ -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

1
openstack/loci/build-rocky.sh
View File

@ -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:-"''"}

1
openstack/loci/build-stein.sh
View File

@ -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:-"''"}

1
openstack/loci/build-train.sh
View File

@ -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:-"''"}

4
openstack/loci/build.sh
View File

@ -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}

1
prometheus-openstack-exporter/exporter/check_os_api.py
View File

@ -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'},

23
zuul.d/openstack-loci.yaml
View File

@ -243,18 +243,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
@ -883,17 +871,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: