Merge "Remove retired congress"
This commit is contained in:
commit
160aeb335f
|
@ -26,8 +26,6 @@ horizon_profiles=${horizon_profiles:-"'horizon apache'"}
|
||||||
horizon_pip_packages=${horizon_pip_packages:-"pycrypto"}
|
horizon_pip_packages=${horizon_pip_packages:-"pycrypto"}
|
||||||
senlin_profiles=${senlin_profiles:-"'senlin'"}
|
senlin_profiles=${senlin_profiles:-"'senlin'"}
|
||||||
senlin_pip_packages=${senlin_pip_packages:-"pycrypto"}
|
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_profiles=${magnum_profiles:-"'magnum'"}
|
||||||
magnum_pip_packages=${magnum_pip_packages:-"pycrypto"}
|
magnum_pip_packages=${magnum_pip_packages:-"pycrypto"}
|
||||||
ironic_profiles=${ironic_profiles:-"'ironic ipxe ipmi qemu tftp'"}
|
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_pip_packages=${neutron_sriov_pip_packages:-"pycrypto"}
|
||||||
neutron_sriov_dist_packages=${neutron_sriov_dist_packages:-"'ethtool lshw'"}
|
neutron_sriov_dist_packages=${neutron_sriov_dist_packages:-"'ethtool lshw'"}
|
||||||
neutron_sriov_extra_tag=${neutron_sriov_extra_tag:-'-sriov-1804'}
|
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
|
source ${SCRIPT_DIR}/build.sh
|
||||||
|
|
|
@ -17,7 +17,6 @@ neutron_pip_packages=${neutron_pip_packages:-"''"}
|
||||||
nova_pip_packages=${nova_pip_packages:-"''"}
|
nova_pip_packages=${nova_pip_packages:-"''"}
|
||||||
horizon_pip_packages=${horizon_pip_packages:-"''"}
|
horizon_pip_packages=${horizon_pip_packages:-"''"}
|
||||||
senlin_pip_packages=${senlin_pip_packages:-"''"}
|
senlin_pip_packages=${senlin_pip_packages:-"''"}
|
||||||
congress_pip_packages=${congress_pip_packages:-"'python-congressclient'"}
|
|
||||||
magnum_pip_packages=${magnum_pip_packages:-"''"}
|
magnum_pip_packages=${magnum_pip_packages:-"''"}
|
||||||
ironic_pip_packages=${ironic_pip_packages:-"''"}
|
ironic_pip_packages=${ironic_pip_packages:-"''"}
|
||||||
neutron_sriov_pip_packages=${neutron_sriov_pip_packages:-"''"}
|
neutron_sriov_pip_packages=${neutron_sriov_pip_packages:-"''"}
|
||||||
|
|
|
@ -17,7 +17,6 @@ neutron_pip_packages=${neutron_pip_packages:-"''"}
|
||||||
nova_pip_packages=${nova_pip_packages:-"''"}
|
nova_pip_packages=${nova_pip_packages:-"''"}
|
||||||
horizon_pip_packages=${horizon_pip_packages:-"''"}
|
horizon_pip_packages=${horizon_pip_packages:-"''"}
|
||||||
senlin_pip_packages=${senlin_pip_packages:-"''"}
|
senlin_pip_packages=${senlin_pip_packages:-"''"}
|
||||||
congress_pip_packages=${congress_pip_packages:-"'python-congressclient'"}
|
|
||||||
magnum_pip_packages=${magnum_pip_packages:-"''"}
|
magnum_pip_packages=${magnum_pip_packages:-"''"}
|
||||||
ironic_pip_packages=${ironic_pip_packages:-"''"}
|
ironic_pip_packages=${ironic_pip_packages:-"''"}
|
||||||
neutron_sriov_pip_packages=${neutron_sriov_pip_packages:-"''"}
|
neutron_sriov_pip_packages=${neutron_sriov_pip_packages:-"''"}
|
||||||
|
|
|
@ -17,7 +17,6 @@ neutron_pip_packages=${neutron_pip_packages:-"''"}
|
||||||
nova_pip_packages=${nova_pip_packages:-"''"}
|
nova_pip_packages=${nova_pip_packages:-"''"}
|
||||||
horizon_pip_packages=${horizon_pip_packages:-"''"}
|
horizon_pip_packages=${horizon_pip_packages:-"''"}
|
||||||
senlin_pip_packages=${senlin_pip_packages:-"''"}
|
senlin_pip_packages=${senlin_pip_packages:-"''"}
|
||||||
congress_pip_packages=${congress_pip_packages:-"'python-congressclient'"}
|
|
||||||
magnum_pip_packages=${magnum_pip_packages:-"''"}
|
magnum_pip_packages=${magnum_pip_packages:-"''"}
|
||||||
ironic_pip_packages=${ironic_pip_packages:-"''"}
|
ironic_pip_packages=${ironic_pip_packages:-"''"}
|
||||||
neutron_sriov_pip_packages=${neutron_sriov_pip_packages:-"''"}
|
neutron_sriov_pip_packages=${neutron_sriov_pip_packages:-"''"}
|
||||||
|
|
|
@ -202,8 +202,6 @@ horizon_profiles=${horizon_profiles:-"'fluent apache'"}
|
||||||
horizon_pip_packages=${horizon_pip_packages:-"pycrypto"}
|
horizon_pip_packages=${horizon_pip_packages:-"pycrypto"}
|
||||||
senlin_profiles=${senlin_profiles:-"fluent"}
|
senlin_profiles=${senlin_profiles:-"fluent"}
|
||||||
senlin_pip_packages=${senlin_pip_packages:-"pycrypto"}
|
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_profiles=${magnum_profiles:-"fluent"}
|
||||||
magnum_pip_packages=${magnum_pip_packages:-"pycrypto"}
|
magnum_pip_packages=${magnum_pip_packages:-"pycrypto"}
|
||||||
ironic_profiles=${ironic_profiles:-"'fluent ipxe ipmi qemu tftp'"}
|
ironic_profiles=${ironic_profiles:-"'fluent ipxe ipmi qemu tftp'"}
|
||||||
|
@ -265,7 +263,7 @@ else
|
||||||
LOCI_ARG_FROM="${BASE_IMAGE}"
|
LOCI_ARG_FROM="${BASE_IMAGE}"
|
||||||
fi
|
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} )
|
projects=( ${BUILD_PROJECTS} )
|
||||||
|
|
||||||
pushd ${LOCI_SRC_DIR}
|
pushd ${LOCI_SRC_DIR}
|
||||||
|
|
|
@ -44,7 +44,6 @@ class CheckOSApi(OSBase):
|
||||||
'designate': {'path': '/', 'expect': [200, 300], 'name': 'designate-api'},
|
'designate': {'path': '/', 'expect': [200, 300], 'name': 'designate-api'},
|
||||||
'contrail_analytics': {'path': '/', 'expect': [200], 'name': 'contrail-analytics-api'},
|
'contrail_analytics': {'path': '/', 'expect': [200], 'name': 'contrail-analytics-api'},
|
||||||
'contrail_config': {'path': '/', 'expect': [200], 'name': 'contrail-config-api'},
|
'contrail_config': {'path': '/', 'expect': [200], 'name': 'contrail-config-api'},
|
||||||
'congress': {'path': '/', 'expect': [200], 'name': 'congress-api'},
|
|
||||||
'placement': {'path': '/', 'expect': [401], 'name': 'placement-api'},
|
'placement': {'path': '/', 'expect': [401], 'name': 'placement-api'},
|
||||||
'shipyard': {'path': 'api/v1.0/health', 'expect': [204, 503], 'name': 'shipyard'},
|
'shipyard': {'path': 'api/v1.0/health', 'expect': [204, 503], 'name': 'shipyard'},
|
||||||
'armada': {'path': 'api/v1.0/health', 'expect': [204, 503], 'name': 'armada'},
|
'armada': {'path': 'api/v1.0/health', 'expect': [204, 503], 'name': 'armada'},
|
||||||
|
|
|
@ -243,18 +243,6 @@
|
||||||
- "PROFILES='fluent'"
|
- "PROFILES='fluent'"
|
||||||
- "WHEELS='{{ wheels_location }}'"
|
- "WHEELS='{{ wheels_location }}'"
|
||||||
tags: *imagetag
|
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
|
- &magnum_project
|
||||||
context: "."
|
context: "."
|
||||||
repository: openstackhelm/magnum
|
repository: openstackhelm/magnum
|
||||||
|
@ -883,17 +871,6 @@
|
||||||
- "PIP_PACKAGES='pycrypto'"
|
- "PIP_PACKAGES='pycrypto'"
|
||||||
- "WHEELS='{{ wheels_location }}'"
|
- "WHEELS='{{ wheels_location }}'"
|
||||||
tags: *imagetag
|
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: "."
|
- context: "."
|
||||||
repository: openstackhelm/magnum
|
repository: openstackhelm/magnum
|
||||||
build_args:
|
build_args:
|
||||||
|
|
Loading…
Reference in New Issue