From 81f3c7a84d84c4f936a81d588f819d342c01e1f1 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Wed, 3 Jan 2018 21:32:19 +0100
Subject: [baremetal] Move include.proxy yml to proper dir

Change-Id: Id46b454b224dacdbaf675155c949d0998f0d0036
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 .../include/proxy.yml                              | 23 ++++++++++++++++++++++
 .../baremetal-mcp-pike-common-ha/include/proxy.yml | 23 ----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/include/proxy.yml
 delete mode 100644 mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/include/proxy.yml

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/include/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/include/proxy.yml
new file mode 100644
index 000000000..5d7475812
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/include/proxy.yml
@@ -0,0 +1,23 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+parameters:
+  # NOTE: Apt proxy is set by curtin, Salt minion proxy is configured below,
+  # only enable proxy via /etc/environment if you need it for smth else
+  # linux:
+  #   system:
+  #     env:
+  #       http_proxy: http://${_param:infra_maas_node01_deploy_address}:8000
+  #       https_proxy: http://${_param:infra_maas_node01_deploy_address}:8000
+  #       no_proxy:
+  #         - .local
+  salt:
+    minion:
+      proxy:
+        host: ${_param:infra_maas_node01_deploy_address}
+        port: 8000
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/include/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/include/proxy.yml
deleted file mode 100644
index 5d7475812..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/include/proxy.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-parameters:
-  # NOTE: Apt proxy is set by curtin, Salt minion proxy is configured below,
-  # only enable proxy via /etc/environment if you need it for smth else
-  # linux:
-  #   system:
-  #     env:
-  #       http_proxy: http://${_param:infra_maas_node01_deploy_address}:8000
-  #       https_proxy: http://${_param:infra_maas_node01_deploy_address}:8000
-  #       no_proxy:
-  #         - .local
-  salt:
-    minion:
-      proxy:
-        host: ${_param:infra_maas_node01_deploy_address}
-        port: 8000
-- 
cgit 1.2.3-korg