[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, 55 deletions

diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml
deleted file mode 100644
index 8854fc2bf..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml
+++ /dev/null
@@ -1,30 +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.linux.system.repo.mcp.openstack
-  - system.linux.system.repo.mcp.extra
-  - service.opendaylight.server.single
-  - cluster.mcp-pike-odl-noha
-  - cluster.mcp-pike-odl-noha.opendaylight.control_pdf
-parameters:
-  _param:
-    linux_system_codename: xenial
-  opendaylight:
-    server:
-      odl_bind_ip: ${_param:single_address}
-      odl_rest_port: 8282
-      java_min_mem: 3g
-      java_max_mem: 3g
-      router_enabled: true
-      karaf_features:
-        odl_default:
-          - odl-restconf-all
-          - odl-aaa-authn
-        netvirt:
-          - odl-netvirt-openstack
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control_pdf.yml.j2
deleted file mode 100644
index fbb7de8b3..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control_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
-##############################################################################
-{%- import 'net_map.j2' as nm with context %}
----
-parameters:
-  linux:
-    network:
-      interface:
-        dhcp_int:
-          enabled: true
-          name: {{ nm.ctl01.nic_admin }}
-          proto: dhcp
-          type: eth
-        single_int:
-          enabled: true
-          name: {{ nm.ctl01.nic_mgmt }}
-          type: eth
-          proto: static
-          address: ${_param:single_address}
-          netmask: 255.255.255.0