Merge "Remove Barbican installation from gates"
This commit is contained in:
commit
28a0a99b5e
|
@ -21,7 +21,6 @@
|
||||||
host-vars:
|
host-vars:
|
||||||
controller:
|
controller:
|
||||||
devstack_plugins:
|
devstack_plugins:
|
||||||
barbican: https://opendev.org/openstack/barbican
|
|
||||||
devstack-plugin-container: https://opendev.org/openstack/devstack-plugin-container
|
devstack-plugin-container: https://opendev.org/openstack/devstack-plugin-container
|
||||||
kuryr-kubernetes: https://opendev.org/openstack/kuryr-kubernetes
|
kuryr-kubernetes: https://opendev.org/openstack/kuryr-kubernetes
|
||||||
octavia: https://opendev.org/openstack/octavia
|
octavia: https://opendev.org/openstack/octavia
|
||||||
|
|
|
@ -18,16 +18,13 @@
|
||||||
description: |
|
description: |
|
||||||
Kuryr-Kubernetes tempest job using octavia
|
Kuryr-Kubernetes tempest job using octavia
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/barbican
|
|
||||||
- openstack/octavia
|
- openstack/octavia
|
||||||
- openstack/python-barbicanclient
|
|
||||||
- openstack/python-octaviaclient
|
- openstack/python-octaviaclient
|
||||||
pre-run: playbooks/get_amphora_tarball.yaml
|
pre-run: playbooks/get_amphora_tarball.yaml
|
||||||
host-vars:
|
host-vars:
|
||||||
controller:
|
controller:
|
||||||
devstack_plugins:
|
devstack_plugins:
|
||||||
octavia: https://opendev.org/openstack/octavia
|
octavia: https://opendev.org/openstack/octavia
|
||||||
barbican: https://opendev.org/openstack/barbican
|
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
OCTAVIA_AMP_IMAGE_FILE: "/tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2"
|
OCTAVIA_AMP_IMAGE_FILE: "/tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2"
|
||||||
|
|
|
@ -116,9 +116,7 @@
|
||||||
Kuryr-Kubernetes job with OVN and Octavia provider OVN running k8s network policy e2e tests
|
Kuryr-Kubernetes job with OVN and Octavia provider OVN running k8s network policy e2e tests
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/neutron
|
- openstack/neutron
|
||||||
- openstack/barbican
|
|
||||||
- openstack/octavia
|
- openstack/octavia
|
||||||
- openstack/python-barbicanclient
|
|
||||||
- openstack/python-octaviaclient
|
- openstack/python-octaviaclient
|
||||||
- openstack/ovn-octavia-provider
|
- openstack/ovn-octavia-provider
|
||||||
pre-run: playbooks/get_amphora_tarball.yaml
|
pre-run: playbooks/get_amphora_tarball.yaml
|
||||||
|
@ -129,7 +127,6 @@
|
||||||
devstack_plugins:
|
devstack_plugins:
|
||||||
neutron: https://opendev.org/openstack/neutron
|
neutron: https://opendev.org/openstack/neutron
|
||||||
octavia: https://opendev.org/openstack/octavia
|
octavia: https://opendev.org/openstack/octavia
|
||||||
barbican: https://opendev.org/openstack/barbican
|
|
||||||
ovn-octavia-provider: https://opendev.org/openstack/ovn-octavia-provider
|
ovn-octavia-provider: https://opendev.org/openstack/ovn-octavia-provider
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
|
|
|
@ -48,9 +48,6 @@ enable_service o-cw
|
||||||
enable_service o-hm
|
enable_service o-hm
|
||||||
enable_service o-hk
|
enable_service o-hk
|
||||||
## Octavia Deps
|
## Octavia Deps
|
||||||
### Image
|
|
||||||
### Barbican
|
|
||||||
enable_plugin barbican https://opendev.org/openstack/barbican
|
|
||||||
### Nova
|
### Nova
|
||||||
enable_service n-api
|
enable_service n-api
|
||||||
enable_service n-api-meta
|
enable_service n-api-meta
|
||||||
|
|
|
@ -76,9 +76,6 @@ enable_service o-cw
|
||||||
enable_service o-hm
|
enable_service o-hm
|
||||||
enable_service o-hk
|
enable_service o-hk
|
||||||
## Octavia Deps
|
## Octavia Deps
|
||||||
### Image
|
|
||||||
### Barbican
|
|
||||||
enable_plugin barbican https://opendev.org/openstack/barbican
|
|
||||||
### Nova
|
### Nova
|
||||||
enable_service n-api
|
enable_service n-api
|
||||||
enable_service n-api-meta
|
enable_service n-api-meta
|
||||||
|
|
|
@ -55,9 +55,6 @@ enable_service o-hk
|
||||||
# OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
|
# OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
|
||||||
# OCTAVIA_AMP_IMAGE_SIZE=3
|
# OCTAVIA_AMP_IMAGE_SIZE=3
|
||||||
# OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial
|
# OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial
|
||||||
### Image
|
|
||||||
### Barbican
|
|
||||||
enable_plugin barbican https://opendev.org/openstack/barbican
|
|
||||||
### Nova
|
### Nova
|
||||||
enable_service n-api
|
enable_service n-api
|
||||||
enable_service n-api-meta
|
enable_service n-api-meta
|
||||||
|
|
|
@ -37,9 +37,6 @@ enable_service o-hk
|
||||||
# OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
|
# OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
|
||||||
# OCTAVIA_AMP_IMAGE_SIZE=3
|
# OCTAVIA_AMP_IMAGE_SIZE=3
|
||||||
# OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial
|
# OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial
|
||||||
### Image
|
|
||||||
### Barbican
|
|
||||||
enable_plugin barbican https://opendev.org/openstack/barbican
|
|
||||||
### Nova
|
### Nova
|
||||||
enable_service n-api
|
enable_service n-api
|
||||||
enable_service n-api-meta
|
enable_service n-api-meta
|
||||||
|
|
|
@ -59,9 +59,6 @@ enable_service o-hk
|
||||||
# OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
|
# OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
|
||||||
# OCTAVIA_AMP_IMAGE_SIZE=3
|
# OCTAVIA_AMP_IMAGE_SIZE=3
|
||||||
# OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial
|
# OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial
|
||||||
### Image
|
|
||||||
### Barbican
|
|
||||||
enable_plugin barbican https://opendev.org/openstack/barbican
|
|
||||||
### Nova
|
### Nova
|
||||||
enable_service n-api
|
enable_service n-api
|
||||||
enable_service n-api-meta
|
enable_service n-api-meta
|
||||||
|
|
|
@ -72,7 +72,6 @@ OpenStack Octavia is a new project that provides advanced Load Balancing by
|
||||||
using pre-existing OpenStack services. The OpenStack requirements that Octavia
|
using pre-existing OpenStack services. The OpenStack requirements that Octavia
|
||||||
adds over the Neutron HAProxy agent are:
|
adds over the Neutron HAProxy agent are:
|
||||||
|
|
||||||
* Barbican
|
|
||||||
* Nova
|
* Nova
|
||||||
* Glance
|
* Glance
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue