openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use User and Group variables instead of sudo"

Browse Source
This commit is contained in:
Zuul 2021-03-09 19:05:41 +00:00 committed by Gerrit Code Review
commit d09647f853
2 changed files with 7 additions and 4 deletions
ansible/roles/octavia
tasks
hm-interface.yml
templates
octavia-interface.service.j2

3
ansible/roles/octavia/tasks/hm-interface.yml

@ -67,11 +67,12 @@
dest: /etc/systemd/system/octavia-interface.service
register: octavia_interface
- name: Reload octavia-interface.service if required
- name: Restart octavia-interface.service if required
become: True
systemd:
name: octavia-interface
daemon_reload: yes
state: restarted
when: octavia_interface.changed
- name: Enable and start octavia-interface.service

8
ansible/roles/octavia/templates/octavia-interface.service.j2

@ -5,10 +5,12 @@ After=docker.service
[Service]
Type=oneshot
User=root
Group=root
RemainAfterExit=true
ExecStartPre=/usr/bin/sudo /sbin/ip link set dev {{ octavia_network_interface }} address {{ port_info.port.mac_address }}
ExecStart=/usr/bin/sudo /sbin/dhclient -v {{ octavia_network_interface }} -cf /etc/dhcp/octavia-dhclient.conf
ExecStop=/usr/bin/sudo /sbin/dhclient -r {{ octavia_network_interface }}
ExecStartPre=/sbin/ip link set dev {{ octavia_network_interface }} address {{ port_info.port.mac_address }}
ExecStart=/sbin/dhclient -v {{ octavia_network_interface }} -cf /etc/dhcp/octavia-dhclient.conf
ExecStop=/sbin/dhclient -r {{ octavia_network_interface }}
[Install]
WantedBy=multi-user.target