diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-01-29 16:08:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-01-29 16:08:07 +0000 |
| commit | a47138bc05bfaba5cff83626ae5f3efc982d6635 (patch) | |
| tree | 3495103cda609faee0e5b053098d669640238f50 /mcp/reclass/classes/cluster/mcp-common-ha | |
| parent | cb5a6d3029bd739d89d97607d2cf8e4f6c71cd6f (diff) | |
| parent | ac7fd699468ad9a02b250e5ef890aff8a03ce1bf (diff) | |
Merge "[ovs] Start ovs services before networking"
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-ha')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 index f1b369c66..de0177a04 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 @@ -42,6 +42,9 @@ parameters: {%- if nm.cmp001.nic_admin in nics %} {%- do nics.pop(nm.cmp001.nic_admin) %} {%- endif %} +{%- if ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) in nics %} + {%- do nics.pop(nm.cmp001.nic_public) %} +{%- endif %} {{ ma.linux_network_interfaces_nic(nics) }} @@ -67,9 +70,8 @@ parameters: gateway: ${_param:opnfv_net_public_gw} name_servers: {{ nm.dns_public }} noifupdown: true - ovs_port_{{ nm.cmp001.nic_public }}: + {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }}: enabled: true - name: {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }} proto: manual ovs_port_type: OVSPort type: ovs_port |