summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-01-22 09:19:01 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-22 09:19:01 +0000
commit924f8cff8c974547db29f16e150f2041af5de9e8 (patch)
tree998ced1435ebb676504473e2abae9464960a4ff8 /mcp/reclass/classes
parent6ab6935577900e598ca60aaed14d2e73f7b1633f (diff)
parent19913423a73f5913f7aa12a0737b2d2d36639efe (diff)
Merge "[baremetal] Fix cmp proto dhcp on PXE/admin"
Diffstat (limited to 'mcp/reclass/classes')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j24
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j24
2 files changed, 8 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
index 7809bd8c8..d5a424431 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
@@ -53,7 +53,11 @@ parameters:
{{ nic }}:
enabled: true
type: eth
+ {%- if nic == nic_admin %}
+ proto: dhcp
+ {%- else %}
proto: manual
+ {%- endif %}
name: {{ nic }}
{%- endfor %}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
index 7acb4b4c6..18ee09064 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
@@ -53,7 +53,11 @@ parameters:
{{ nic }}:
enabled: true
type: eth
+ {%- if nic == nic_admin %}
+ proto: dhcp
+ {%- else %}
proto: manual
+ {%- endif %}
name: {{ nic }}
{%- endfor %}