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

9 files changed, 267 insertions, 0 deletions

diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2
new file mode 100644
index 000000000..43e8c1f39
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2
@@ -0,0 +1,28 @@
+##############################################################################
+# 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-common-noha.infra.config
+  - cluster.mcp-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-odl-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/init.yml
new file mode 100644
index 000000000..a80228ccd
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/init.yml
@@ -0,0 +1,14 @@
+##############################################################################
+# 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-common-noha.infra
+
+parameters:
+  _param:
+    cluster_name: mcp-odl-noha
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml
new file mode 100644
index 000000000..a595bf0b5
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml
@@ -0,0 +1,17 @@
+##############################################################################
+# 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.single
+  - cluster.mcp-common-noha.init_options
+  - cluster.mcp-odl-noha.infra
+  - cluster.mcp-odl-noha.openstack
+
+parameters:
+  _param:
+    opendaylight_service_host: ${_param:opnfv_opendaylight_server_node01_single_address}
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml
new file mode 100644
index 000000000..0b513f065
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml
@@ -0,0 +1,30 @@
+##############################################################################
+# 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-odl-noha
+  - cluster.mcp-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-odl-noha/opendaylight/control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2
new file mode 100644
index 000000000..fbb7de8b3
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2
@@ -0,0 +1,25 @@
+##############################################################################
+# 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
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
new file mode 100644
index 000000000..d0ee3a3e0
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
@@ -0,0 +1,72 @@
+##############################################################################
+# 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-common-noha.openstack_compute
+  - cluster.mcp-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-odl-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml
new file mode 100644
index 000000000..f5ed2dc5d
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml
@@ -0,0 +1,34 @@
+##############################################################################
+# 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-common-noha.openstack_control
+  - cluster.mcp-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-odl-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml
new file mode 100644
index 000000000..e554eb6b6
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml
@@ -0,0 +1,25 @@
+##############################################################################
+# 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-common-noha.openstack_gateway
+  - service.neutron.gateway.opendaylight.single
+  - cluster.mcp-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-odl-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml
new file mode 100644
index 000000000..91e002667
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml
@@ -0,0 +1,22 @@
+##############################################################################
+# 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-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}