Skip to content

Commit

Permalink
[stable/2023.2] fix: neutron designate integration (#1396)
Browse files Browse the repository at this point in the history
This is an automated cherry-pick of #1389
/assign mnaser
  • Loading branch information
vexxhost-bot authored Jun 18, 2024
1 parent f5ee799 commit 18e5330
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
10 changes: 5 additions & 5 deletions roles/neutron/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
# License for the specific language governing permissions and limitations
# under the License.

- name: Set external_dns_driver
ansible.builtin.set_fact:
_neutron_external_dns_driver: "designate"
when: neutron_designate_integration_enabled | bool

- name: Generate Helm values
ansible.builtin.set_fact:
_neutron_helm_values: "{{ __neutron_helm_values }}"
Expand All @@ -21,11 +26,6 @@
ansible.builtin.set_fact:
_neutron_helm_values: "{{ _neutron_helm_values | combine(__neutron_ovn_helm_values, recursive=True) }}"

- name: Set external_dns_driver
ansible.builtin.set_fact:
_neutron_external_dns_driver: "designate"
when: neutron_designate_integration_enabled | bool

- name: Deploy Helm chart
run_once: true
kubernetes.core.helm:
Expand Down
6 changes: 6 additions & 0 deletions roles/neutron/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ __neutron_helm_values:
database:
connection_recycle_time: 10
max_pool_size: 1
designate:
url: http://designate-api.openstack.svc.cluster.local:9001/v2
auth_url: http://keystone-api.openstack.svc.cluster.local:5000
region_name: "{{ openstack_helm_endpoints_neutron_region_name }}"
username: "neutron-{{ openstack_helm_endpoints_neutron_region_name }}"
password: "{{ openstack_helm_endpoints_neutron_keystone_password }}"
nova:
live_migration_events: true
placement:
Expand Down

0 comments on commit 18e5330

Please sign in to comment.