[reclass] Move MaaS classes to common dir for NOHA

Prepare for reusing MaaS-related reclass classes for NOHA scenarios.

JIRA: FUEL-338

Change-Id: Ic8ddd5915563f58643ef8c7ac4055a1000db7d45
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

2 files changed, 0 insertions, 52 deletions

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/include/lab_proxy_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/include/lab_proxy_pdf.yml.j2
deleted file mode 100644
index 3f238d667..000000000
--- a/mcp/reclass/classes/cluster/mcp-common-ha/include/lab_proxy_pdf.yml.j2
+++ /dev/null
@@ -1,25 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 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
-##############################################################################
----
-# We'll craft this class so it can be reused on both cfg01 and mas01
-{%- if conf.idf.fuel.network.upstream_proxy is defined %}
-{%- set upstream_proxy=conf.idf.fuel.network.upstream_proxy %}
-parameters:
-  maas:
-    region:
-      upstream_proxy:
-        address: {{ upstream_proxy.address }}
-        port: {{ upstream_proxy.port }}
-  linux:
-    system:
-      proxy:
-        pkg:
-          enabled: true
-          http: http://{{ upstream_proxy.address }}:{{ upstream_proxy.port }}
-          https: http://{{ upstream_proxy.address }}:{{ upstream_proxy.port }}
-{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/include/maas_proxy.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/include/maas_proxy.yml.j2
deleted file mode 100644
index 58ea46cad..000000000
--- a/mcp/reclass/classes/cluster/mcp-common-ha/include/maas_proxy.yml.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 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
-##############################################################################
----
-{%- if 'maas' in conf.cluster.states %}
-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
-  linux:
-    system:
-      proxy:
-        pkg:
-          enabled: true
-          http: http://${_param:infra_maas_node01_deploy_address}:8000
-          https: http://${_param:infra_maas_node01_deploy_address}:8000
-{%- endif %}