diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-08-28 14:50:03 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-08-28 20:23:26 +0400 |
| commit | 4003dfc1ff62edc587f83aa54cd9eb3fd0347635 (patch) | |
| tree | db7c59ebfb5350d519a2bf5a221d2ec01e1ab4fe /mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha | |
| parent | 08bb570b39b123c5a5adf70e34e05bb43a6e3387 (diff) | |
Sync os cacert from proxy to salt master
JIRA: FUEL-274
Change-Id: I2c8161b24cb18a0d1f9dc6fd509ce18af7ea8cf5
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha')
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml | 1 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml index ce2c95145..a75b41d3d 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml @@ -37,6 +37,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-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml index 6f47f8ad0..a5913dd52 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-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 bind: server: control: |