diff --git a/.zuul.d/multinode.yaml b/.zuul.d/multinode.yaml index b38509a17..78d56e1b6 100644 --- a/.zuul.d/multinode.yaml +++ b/.zuul.d/multinode.yaml @@ -21,7 +21,6 @@ host-vars: controller: devstack_plugins: - barbican: https://opendev.org/openstack/barbican devstack-plugin-container: https://opendev.org/openstack/devstack-plugin-container kuryr-kubernetes: https://opendev.org/openstack/kuryr-kubernetes octavia: https://opendev.org/openstack/octavia diff --git a/.zuul.d/octavia.yaml b/.zuul.d/octavia.yaml index a80ddb428..ac947cb47 100644 --- a/.zuul.d/octavia.yaml +++ b/.zuul.d/octavia.yaml @@ -18,16 +18,13 @@ description: | Kuryr-Kubernetes tempest job using octavia required-projects: - - openstack/barbican - openstack/octavia - - openstack/python-barbicanclient - openstack/python-octaviaclient pre-run: playbooks/get_amphora_tarball.yaml host-vars: controller: devstack_plugins: octavia: https://opendev.org/openstack/octavia - barbican: https://opendev.org/openstack/barbican vars: devstack_localrc: OCTAVIA_AMP_IMAGE_FILE: "/tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2" diff --git a/.zuul.d/sdn.yaml b/.zuul.d/sdn.yaml index 890ae5c1a..3ebe9f593 100644 --- a/.zuul.d/sdn.yaml +++ b/.zuul.d/sdn.yaml @@ -116,9 +116,7 @@ Kuryr-Kubernetes job with OVN and Octavia provider OVN running k8s network policy e2e tests required-projects: - openstack/neutron - - openstack/barbican - openstack/octavia - - openstack/python-barbicanclient - openstack/python-octaviaclient - openstack/ovn-octavia-provider pre-run: playbooks/get_amphora_tarball.yaml @@ -129,7 +127,6 @@ devstack_plugins: neutron: https://opendev.org/openstack/neutron octavia: https://opendev.org/openstack/octavia - barbican: https://opendev.org/openstack/barbican ovn-octavia-provider: https://opendev.org/openstack/ovn-octavia-provider vars: devstack_localrc: diff --git a/devstack/local.conf.openshift.sample b/devstack/local.conf.openshift.sample index d9a0f7eae..bb283d3cc 100644 --- a/devstack/local.conf.openshift.sample +++ b/devstack/local.conf.openshift.sample @@ -48,9 +48,6 @@ enable_service o-cw enable_service o-hm enable_service o-hk ## Octavia Deps -### Image -### Barbican -enable_plugin barbican https://opendev.org/openstack/barbican ### Nova enable_service n-api enable_service n-api-meta diff --git a/devstack/local.conf.ovn.sample b/devstack/local.conf.ovn.sample index 5d1770f15..c226bb6d3 100644 --- a/devstack/local.conf.ovn.sample +++ b/devstack/local.conf.ovn.sample @@ -76,9 +76,6 @@ enable_service o-cw enable_service o-hm enable_service o-hk ## Octavia Deps -### Image -### Barbican -enable_plugin barbican https://opendev.org/openstack/barbican ### Nova enable_service n-api enable_service n-api-meta diff --git a/devstack/local.conf.pod-in-vm.undercloud.ovn.sample b/devstack/local.conf.pod-in-vm.undercloud.ovn.sample index 591611122..10041d449 100644 --- a/devstack/local.conf.pod-in-vm.undercloud.ovn.sample +++ b/devstack/local.conf.pod-in-vm.undercloud.ovn.sample @@ -55,9 +55,6 @@ enable_service o-hk # OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2 # OCTAVIA_AMP_IMAGE_SIZE=3 # OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial -### Image -### Barbican -enable_plugin barbican https://opendev.org/openstack/barbican ### Nova enable_service n-api enable_service n-api-meta diff --git a/devstack/local.conf.pod-in-vm.undercloud.sample b/devstack/local.conf.pod-in-vm.undercloud.sample index a3e12052f..09e45f459 100644 --- a/devstack/local.conf.pod-in-vm.undercloud.sample +++ b/devstack/local.conf.pod-in-vm.undercloud.sample @@ -37,9 +37,6 @@ enable_service o-hk # OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2 # OCTAVIA_AMP_IMAGE_SIZE=3 # OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial -### Image -### Barbican -enable_plugin barbican https://opendev.org/openstack/barbican ### Nova enable_service n-api enable_service n-api-meta diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample index f6744105f..fc52f5c75 100644 --- a/devstack/local.conf.sample +++ b/devstack/local.conf.sample @@ -59,9 +59,6 @@ enable_service o-hk # OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2 # OCTAVIA_AMP_IMAGE_SIZE=3 # OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial -### Image -### Barbican -enable_plugin barbican https://opendev.org/openstack/barbican ### Nova enable_service n-api enable_service n-api-meta diff --git a/doc/source/installation/services.rst b/doc/source/installation/services.rst index 897b57367..6c8f0735d 100644 --- a/doc/source/installation/services.rst +++ b/doc/source/installation/services.rst @@ -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 adds over the Neutron HAProxy agent are: -* Barbican * Nova * Glance