Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with stackhpc/yoga #163

Closed
wants to merge 1 commit into from
+11 −0
Closed

Sync with stackhpc/yoga #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions doc/source/user/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,8 @@ the table are linked to more details elsewhere in the user guide.
+---------------------------------------+--------------------+---------------+
| `extra_security_group`_ | see below | see below |
+---------------------------------------+--------------------+---------------+
| `octavia_provider`_ | see below | amphora |
+---------------------------------------+--------------------+---------------+

.. _cluster:

Expand Down Expand Up @@ -1682,6 +1684,9 @@ _`extra_security_group`
Optional additional group name or UUID to add to network port.
Only used when 'extra_network' is defined.
Default: cluster node default security group.

_`octavia_provider`
Octavia provider driver to be used for creating load balancers.

External load balancer for services
-----------------------------------
Expand Down
1 change: 1 addition & 0 deletions magnum/drivers/common/templates/lb_api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ parameters:

octavia_provider:
type: string
default: amphora
description: Octavia provider to use for load balancer

octavia_lb_algorithm:
Expand Down
5 changes: 5 additions & 0 deletions magnum/tests/unit/drivers/test_template_definition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,7 @@ def test_k8s_get_params(self, mock_generate_csr_and_key,
extra_network = mock_cluster.labels.get('extra_network')
extra_subnet = mock_cluster.labels.get('extra_subnet')
extra_security_group = mock_cluster.labels.get('extra_security_group')
octavia_provider = mock_cluster.labels.get('octavia_provider')

k8s_def = k8sa_tdef.AtomicK8sTemplateDefinition()

Expand Down Expand Up @@ -773,6 +774,7 @@ def test_k8s_get_params(self, mock_generate_csr_and_key,
'extra_network': extra_network,
'extra_subnet': extra_subnet,
'extra_security_group': extra_security_group,
'octavia_provider': octavia_provider,
}}
mock_get_params.assert_called_once_with(mock_context,
mock_cluster_template,
Expand Down Expand Up @@ -1216,6 +1218,8 @@ def test_k8s_get_params_insecure(self, mock_generate_csr_and_key,
octavia_lb_healthcheck = mock_cluster.labels.get(
'octavia_lb_healthcheck')

octavia_provider = mock_cluster.labels.get('octavia_provider')

k8s_def = k8sa_tdef.AtomicK8sTemplateDefinition()

k8s_def.get_params(mock_context, mock_cluster_template, mock_cluster)
Expand Down Expand Up @@ -1352,6 +1356,7 @@ def test_k8s_get_params_insecure(self, mock_generate_csr_and_key,
'extra_network': extra_network,
'extra_subnet': extra_subnet,
'extra_security_group': extra_security_group,
'octavia_provider': octavia_provider,
}}
mock_get_params.assert_called_once_with(mock_context,
mock_cluster_template,
Expand Down
Loading