Merge "Add openvswitch/hugetlbfs user and group on update" into stable/pike
This commit is contained in:
commit
3f6e572279
|
@ -153,6 +153,8 @@ outputs:
|
|||
- neutron::agents::ml2::ovs::firewall_driver: {get_param: NeutronOVSFirewallDriver}
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::neutron::ovs
|
||||
update_tasks:
|
||||
get_attr: [Ovs, role_data, update_tasks]
|
||||
upgrade_tasks:
|
||||
list_concat:
|
||||
- get_attr: [Ovs, role_data, upgrade_tasks]
|
||||
|
|
|
@ -115,5 +115,7 @@ outputs:
|
|||
nova_libvirt:
|
||||
nova::compute::libvirt::qemu::group: {get_attr: [RoleParametersValue, value, vhostuser_socket_group]}
|
||||
step_config: {get_attr: [NeutronOvsAgent, role_data, step_config]}
|
||||
update_tasks:
|
||||
get_attr: [Ovs, role_data, update_tasks]
|
||||
upgrade_tasks:
|
||||
get_attr: [Ovs, role_data, upgrade_tasks]
|
||||
|
|
|
@ -140,6 +140,8 @@ outputs:
|
|||
- get_attr: [RoleParametersValue, value]
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::plugins::ovs::opendaylight
|
||||
update_tasks:
|
||||
get_attr: [Ovs, role_data, update_tasks]
|
||||
upgrade_tasks:
|
||||
list_concat:
|
||||
- get_attr: [Ovs, role_data, upgrade_tasks]
|
||||
|
|
|
@ -140,6 +140,30 @@ outputs:
|
|||
OvsDpdkDriverType: {if: [driver_not_set, {get_param: NeutronDpdkDriverType}, {get_param: OvsDpdkDriverType}]}
|
||||
OvsPmdCoreList: {if: [pmd_cores_empty, {get_param: NeutronDpdkCoreList}, {get_param: OvsPmdCoreList}]}
|
||||
|
||||
update_tasks:
|
||||
# Ovs uses openvswitch:hugetlbfs as user and group settings
|
||||
# when updating to 2.8 onwards, but openvswitch user is not
|
||||
# created during package update. This adds workaround to
|
||||
# make sure openvswitch user exist before running package
|
||||
# update. Details can be found at:
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1559374
|
||||
# 42477 is the kolla hugetlbfs gid value.
|
||||
- name: ensure hugetlbfs group is present
|
||||
when: step == "2"
|
||||
group:
|
||||
name: hugetlbfs
|
||||
gid: 42477
|
||||
|
||||
- name: ensure openvswitch user is present on the host
|
||||
when: step == "2"
|
||||
user:
|
||||
name: openvswitch
|
||||
home: /
|
||||
system: yes
|
||||
groups: hugetlbfs
|
||||
shell: /sbin/nologin
|
||||
comment: "OpenvSwitch Daemons"
|
||||
|
||||
upgrade_tasks:
|
||||
- name: Check openvswitch version.
|
||||
tags: step2
|
||||
|
|
Loading…
Reference in New Issue