From 4003dfc1ff62edc587f83aa54cd9eb3fd0347635 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Mon, 28 Aug 2017 14:50:03 +0400 Subject: Sync os cacert from proxy to salt master JIRA: FUEL-274 Change-Id: I2c8161b24cb18a0d1f9dc6fd509ce18af7ea8cf5 Signed-off-by: Michael Polenchuk --- .../classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml | 1 + .../classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml | 3 +++ 2 files changed, 4 insertions(+) (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml index 202799fde..a7b08f8df 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml @@ -38,6 +38,7 @@ parameters: salt: master: accept_policy: open_mode + file_recv: true reclass: storage: data_source: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml index 227c64921..e8666d6c1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml @@ -39,6 +39,9 @@ parameters: interface: ens2: ${_param:linux_dhcp_interface} ens3: ${_param:linux_single_interface} + keystone: + server: + cacert: /etc/ssl/certs/mcp_os_cacert neutron: server: backend: -- cgit 1.2.3-korg