summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-04-18 18:38:56 +0000
committerGerrit Code Review <review@openstack.org>2019-04-18 18:38:56 +0000
commit7f32139e84453d1d36ac2f59df736097e06e442e (patch)
treeb93da5b240e4d5c39207940aca5c11c7e4370fca
parent322f0469585db01aa431e8ae1f75c2676c18d33a (diff)
parent9d107faf63cff1305973047f1a6d01d4ca13a9c1 (diff)
Merge "Fix OVN provider for Octavia DevStack sample file(s)"HEADmaster
-rw-r--r--devstack/local.conf.sample11
-rw-r--r--devstack/ovn-octavia-provider.conf.sample8
-rw-r--r--doc/source/admin/loadbalancer.rst10
3 files changed, 12 insertions, 17 deletions
diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample
index 6c526a5..2b0046c 100644
--- a/devstack/local.conf.sample
+++ b/devstack/local.conf.sample
@@ -85,20 +85,11 @@ disable_service cinder c-sch c-api c-vol
85#enable_service skydive-analyzer 85#enable_service skydive-analyzer
86#enable_service skydive-agent 86#enable_service skydive-agent
87 87
88
89# Octavia with OVN provider driver. OVN provider driver uses the OVN native 88# Octavia with OVN provider driver. OVN provider driver uses the OVN native
90# load balancer and it only supports L4 TCP load balancer and doesn't support 89# load balancer and it only supports L4 TCP load balancer and doesn't support
91# health check monitor and other advanced features supported by Octavia 90# health check monitor and other advanced features supported by Octavia
92# amphore driver. If you want to enable Octavia amphore driver, please see 91# amphore driver. If you want to enable Octavia amphore driver, please see
93# the local.conf sample in the octavia repo. 92# http://git.openstack.org/cgit/openstack/networking-ovn/tree/devstack/ovn-octavia-provider.conf.sample
94enable_plugin octavia https://git.openstack.org/openstack/octavia
95enable_service octavia
96enable_service o-api
97enable_service o-hk
98disable_service o-cw
99disable_service o-hm
100DISABLE_AMP_IMAGE_BUILD=True
101LIBS_FROM_GIT+=python-octaviaclient
102 93
103# If you want to enable a provider network instead of the default private 94# If you want to enable a provider network instead of the default private
104# network after your DevStack environment installation, you *must* set 95# network after your DevStack environment installation, you *must* set
diff --git a/devstack/ovn-octavia-provider.conf.sample b/devstack/ovn-octavia-provider.conf.sample
index 02919fc..4875822 100644
--- a/devstack/ovn-octavia-provider.conf.sample
+++ b/devstack/ovn-octavia-provider.conf.sample
@@ -11,7 +11,7 @@ RABBIT_PASSWORD=password
11SERVICE_PASSWORD=password 11SERVICE_PASSWORD=password
12SERVICE_TOKEN=password 12SERVICE_TOKEN=password
13ADMIN_PASSWORD=password 13ADMIN_PASSWORD=password
14enable_plugin networking-ovn $GIT_BASE/openstack/networking-ovn 14enable_plugin networking-ovn https://git.openstack.org/openstack/networking-ovn
15enable_service ovn-northd 15enable_service ovn-northd
16enable_service ovn-controller 16enable_service ovn-controller
17enable_service networking-ovn-metadata-agent 17enable_service networking-ovn-metadata-agent
@@ -23,14 +23,16 @@ disable_service q-l3
23disable_service q-dhcp 23disable_service q-dhcp
24disable_service q-meta 24disable_service q-meta
25 25
26OCTAVIA_NODE="api"
26DISABLE_AMP_IMAGE_BUILD=True 27DISABLE_AMP_IMAGE_BUILD=True
27enable_plugin octavia $GIT_BASE/openstack/octavia 28enable_plugin octavia https://git.openstack.org/openstack/octavia
28enable_service octavia 29enable_service octavia
29enable_service o-api 30enable_service o-api
30enable_service o-hk 31enable_service o-hk
32enable_service o-da
31disable_service o-cw 33disable_service o-cw
32disable_service o-hm 34disable_service o-hm
33 35
34[[post-config|$OCTAVIA_CONF]] 36[[post-config|$OCTAVIA_CONF]]
35[api_settings] 37[api_settings]
36enabled_provider_drivers = amphora:'Octavia Amphora driver',ovn:'Octavia OVN driver' 38enabled_provider_drivers = ovn:'Octavia OVN driver'
diff --git a/doc/source/admin/loadbalancer.rst b/doc/source/admin/loadbalancer.rst
index baa05fb..2470d2f 100644
--- a/doc/source/admin/loadbalancer.rst
+++ b/doc/source/admin/loadbalancer.rst
@@ -46,8 +46,9 @@ options in:
46 46
47.. literalinclude:: ../../../devstack/ovn-octavia-provider.conf.sample 47.. literalinclude:: ../../../devstack/ovn-octavia-provider.conf.sample
48 48
49Kindly note that the configuration allows the user to create 49Kindly note that the configuration here shows only OVN provider driver but
50Load Balancers of both Amphora and OVN types. 50in theory, user can create Load Balancers of both Amphora and OVN types by
51enabling the correct configuration settings.
51 52
52Once the DevStack run is complete, the user can create a load balancer 53Once the DevStack run is complete, the user can create a load balancer
53in Openstack:: 54in Openstack::
@@ -76,8 +77,9 @@ in Openstack::
76 | vip_subnet_id | 3eed0c05-6527-400e-bb80-df6e59d248f1 | 77 | vip_subnet_id | 3eed0c05-6527-400e-bb80-df6e59d248f1 |
77 +---------------------+--------------------------------------+ 78 +---------------------+--------------------------------------+
78 79
79The user can see the different types of loadbalancers with their associated 80If both Amphora and OVN drivers are enabled, then the user can create
80providers as below:: 81different types of loadbalancers with their associated providers which
82would be visible as shown below::
81 83
82 +--------------------------------------+------+----------------------------------+-------------+---------------------+----------+ 84 +--------------------------------------+------+----------------------------------+-------------+---------------------+----------+
83 | id | name | project_id | vip_address | provisioning_status | provider | 85 | id | name | project_id | vip_address | provisioning_status | provider |