[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>

4 files changed, 0 insertions, 153 deletions

diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml.j2
deleted file mode 100644
index 12dfdcaa1..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml.j2
+++ /dev/null
@@ -1,72 +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:
-  - service.neutron.compute.single
-  - service.neutron.compute.opendaylight.single
-{%- if conf.MCP_DPDK_MODE %}
-  - system.nova.compute.nfv.hugepages
-  - system.neutron.compute.nfv.dpdk
-{%- endif %}
-  - cluster.mcp-pike-common-noha.openstack_compute
-  - cluster.mcp-pike-odl-noha
-parameters:
-  linux:
-    network:
-      interface:
-{%- if conf.MCP_DPDK_MODE %}
-        dpdk0:
-          name: ${_param:dpdk0_name}
-          pci: ${_param:dpdk0_pci}
-          driver: ${_param:dpdk0_driver}
-          enabled: true
-          bridge: br-prv
-          type: dpdk_ovs_port
-          n_rxq: ${_param:dpdk0_n_rxq}
-        br-prv:
-          enabled: true
-          type: dpdk_ovs_bridge
-          proto: static
-          address: ${_param:tenant_address}
-          netmask: 255.255.255.0
-        tenant_interface:
-          type: dpdk  # Not a meaningful type, just match 'dpdk' for filtering
-{%- endif %}
-        external_interface:
-          enabled: true
-          type: eth
-          name: ${_param:external_interface}
-          mtu: ${_param:interface_mtu}
-          proto: manual
-        br-mesh:
-          enabled: true
-          type: bridge
-          proto: static
-          address: ${_param:tenant_address}
-          netmask: 255.255.255.0
-          use_interfaces:
-            - ${_param:tenant_interface}
-        br-floating:
-          enabled: true
-          type: ovs_bridge
-          mtu: ${_param:interface_mtu}
-        float-to-ex:
-          enabled: true
-          type: ovs_port
-          mtu: ${_param:interface_mtu}
-          bridge: br-floating
-        br-ex:
-          enabled: true
-          type: bridge
-          mtu: ${_param:interface_mtu}
-          address: ${_param:external_address}
-          netmask: ${_param:opnfv_net_public_mask}
-          use_interfaces:
-            - ${_param:external_interface}
-          use_ovs_ports:
-            - float-to-ex
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml
deleted file mode 100644
index 4c48d0798..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml
+++ /dev/null
@@ -1,34 +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.neutron.control.opendaylight.single
-  - cluster.mcp-pike-common-noha.openstack_control
-  - cluster.mcp-pike-odl-noha
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        opendaylight-rest:
-          type: general-service
-          service_name: opendaylight
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 8282
-          servers:
-            - name: odl01
-              host: ${_param:opendaylight_service_host}
-              port: 8282
-              params: ${_param:haproxy_check}
-  keystone:
-    server:
-      openrc_extra:
-        # For noHA, all public services are available through haproxy on ctl
-        sdn_controller_ip: ${_param:cluster_vip_address}
-        sdn_username: admin  # Hardcoded to default ODL values for now
-        sdn_password: admin
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml
deleted file mode 100644
index f4f646160..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml
+++ /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
-##############################################################################
----
-classes:
-  - cluster.mcp-pike-common-noha.openstack_gateway
-  - service.neutron.gateway.opendaylight.single
-  - cluster.mcp-pike-odl-noha
-parameters:
-  linux:
-    network:
-      interface:
-        br-mesh:
-          enabled: true
-          type: bridge
-          mtu: ${_param:interface_mtu}
-          proto: static
-          address: ${_param:tenant_address}
-          netmask: 255.255.255.0
-          use_interfaces:
-            - ${_param:tenant_interface}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/init.yml
deleted file mode 100644
index 2cd3083ff..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/init.yml
+++ /dev/null
@@ -1,22 +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.openstack_init
-parameters:
-  _param:
-    neutron_tenant_network_types: "flat,vxlan"
-    opendaylight_router: odl-router_v2
-  linux:
-    network:
-      host:
-        odl01:
-          address: ${_param:opnfv_opendaylight_server_node01_single_address}
-          names:
-            - odl01
-            - odl01.${_param:cluster_domain}