diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-31 02:12:51 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-17 21:07:16 +0100 |
| commit | 5acee090a5ecd7bcb5d66769ff83ef37e8e43dae (patch) | |
| tree | d735510131d7ae238c7f09051fa557dd9f445bee /mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | |
| parent | 81561126307f15d4f65a743ed2431ea8c713a921 (diff) | |
[baremetal] Use upstream lab proxy for keyservers
Proxy chainloading does not always work for keyserver requests, so:
- mv common.infra.lab_proxy_pdf common.include.lab_proxy_pdf;
- mv common.include.proxy common.include.maas_proxy;
- include lab_proxy_pdf after each maas_proxy, so if upstream_proxy
is defined, it will override the MaaS proxy;
JIRA: FUEL-317
Change-Id: I63749be0d350ea73ea2cf6e629710766b14ecb73
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml index 2e79f808e..aed8bcb57 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml @@ -18,7 +18,8 @@ classes: - system.cinder.volume.backend.lvm - system.ceilometer.agent.cluster - cluster.mcp-pike-common-ha.openstack_compute_pdf - - cluster.mcp-pike-common-ha.include.proxy + - cluster.mcp-pike-common-ha.include.maas_proxy + - cluster.mcp-pike-common-ha.include.lab_proxy_pdf parameters: _param: cluster_vip_address: ${_param:openstack_control_address} |