[noha] Update OpenStack version to Queens

* make cluster names version-agnostic
* pre-install oslo-templates formula
* salt version update to 2017.7
* system reclass update

Change-Id: I903895f6bcd98a1062e66e3f14d23ec04dc1b869
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

2 files changed, 0 insertions, 42 deletions

diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml.j2
deleted file mode 100644
index 46e25fe95..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml.j2
+++ /dev/null
@@ -1,28 +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
-##############################################################################
----
-classes:
-  - system.reclass.storage.system.opendaylight_control_single
-  - system.reclass.storage.system.openstack_gateway_single
-  - cluster.mcp-pike-common-noha.infra.config
-  - cluster.mcp-pike-odl-noha
-  - cluster.all-mcp-arch-common.infra.config{%- if conf.MCP_DPDK_MODE %}_dpdk{%- endif %}_pdf
-parameters:
-  reclass:
-    storage:
-      node:
-        opendaylight_control_node01:
-          classes:
-            - cluster.${_param:cluster_name}.opendaylight.control
-          params:
-            linux_system_codename: xenial
-            single_address: ${_param:opendaylight_service_host}
-        openstack_gateway_node01:
-          params:
-            tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address}
-            external_address: ${_param:opnfv_openstack_gateway_node01_external_address}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/init.yml
deleted file mode 100644
index 1bdcbd225..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/init.yml
+++ /dev/null
@@ -1,14 +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
-##############################################################################
----
-classes:
-  - cluster.mcp-pike-common-noha.infra
-
-parameters:
-  _param:
-    cluster_name: mcp-pike-odl-noha