diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-pike-odl-ha')
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 index 912537f8f..7cf4c8864 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 @@ -8,7 +8,7 @@ {%- import 'net_map.j2' as nm with context %} {#- Filter-out NIC duplicates by constructing a dict (used NICs only) #} {%- set nics = { nm.cmp001.nic_private: True } %} -{%- set vlan_private_start = nm.vlan_private.rsplit('-')[0] %} +{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %} {%- set vlans = { vlan_private_start: nm.cmp001.nic_private } %} --- parameters: diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml index cd1ae9040..3c6b3a2cf 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml @@ -14,18 +14,6 @@ parameters: nginx: server: site: - nginx_proxy_opendaylight_web: - enabled: true - type: nginx_proxy - name: opendaylight_web - check: false - proxy: - host: ${_param:opendaylight_service_host} - port: 8181 - protocol: http - host: - name: ${_param:nginx_proxy_openstack_api_host} - port: 8181 nginx_proxy_opendaylight_rest: enabled: true type: nginx_proxy |