55 files changed, 102 insertions, 86 deletions

diff --git a/mcp/config/scenario/defaults.yaml b/mcp/config/scenario/defaults.yaml
index 6affc7da6..283ffc542 100644
--- a/mcp/config/scenario/defaults.yaml
+++ b/mcp/config/scenario/defaults.yaml
@@ -14,10 +14,10 @@ x86_64:
   common:
     apt:
       keys:
-        - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub
+        - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub
       repos:
         # <repo name> <repo prio> deb [arch=<arch>] <repo url> <repo dist> <repo comp>
-        - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main
+        - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7 xenial main
     pkg:
       install:
         - linux-generic-hwe-16.04
@@ -35,12 +35,12 @@ aarch64:
   common:
     apt:
       keys:
-        - https://linux.enea.com/mcp-repos/pike/xenial/archive-mcppike.key
-        - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub
+        - https://linux.enea.com/mcp-repos/queens/xenial/archive-mcpqueens.key
+        - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub
       repos:
         # <repo name> <repo prio> deb [arch=<arch>] <repo url> <repo dist> <repo comp>
-        - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main
-        - armband 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/pike/xenial pike-armband main
+        - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7 xenial main
+        - armband 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/queens/xenial queens-armband main
     pkg:
       install:
         - linux-generic-hwe-16.04
diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
index 3a36ae297..1926d4977 100644
--- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: mcp-pike-ovs-noha.local
+  domain: mcp-ovs-noha.local
   states:
     - openstack_noha
     - neutron_gateway
diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml
index eed17c1a4..b44647c25 100644
--- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: mcp-pike-ovs-dpdk-noha.local
+  domain: mcp-ovs-dpdk-noha.local
   states:
     - dpdk
     - openstack_noha
diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml
index f52eaf5aa..c61abd539 100644
--- a/mcp/config/scenario/os-odl-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: mcp-pike-odl-noha.local
+  domain: mcp-odl-noha.local
   states:
     - opendaylight
     - openstack_noha
diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml b/mcp/config/scenario/os-odl-ovs-noha.yaml
index c282707f7..84eaf6318 100644
--- a/mcp/config/scenario/os-odl-ovs-noha.yaml
+++ b/mcp/config/scenario/os-odl-ovs-noha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: mcp-pike-odl-noha.local
+  domain: mcp-odl-noha.local
   states:
     - dpdk
     - opendaylight
diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml
index 104df96d3..d2015754e 100644
--- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: mcp-pike-ovn-noha.local
+  domain: mcp-ovn-noha.local
   states:
     - openstack_noha
     - networks
diff --git a/mcp/reclass/classes/cluster/.gitignore b/mcp/reclass/classes/cluster/.gitignore
index 7d40a2bec..a37a68691 100644
--- a/mcp/reclass/classes/cluster/.gitignore
+++ b/mcp/reclass/classes/cluster/.gitignore
@@ -15,5 +15,5 @@ mcp-pike-ovn-ha/infra/init_vcp.yml
 mcp-pike-ovn-ha/infra/kvm.yml
 mcp-pike-odl-ha/opendaylight/control.yml
 mcp-pike-odl-ha/openstack/init.yml
-mcp-pike-odl-noha/infra/config.yml
-mcp-pike-odl-noha/openstack/compute.yml
+mcp-odl-noha/infra/config.yml
+mcp-odl-noha/openstack/compute.yml
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml
index 7235071f5..7235071f5 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/haproxy_openstack_api.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml
index 00f3b76ab..00f3b76ab 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml
index ede41940a..ede41940a 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/init_options.yml b/mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml
index 69aba92ad..69aba92ad 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/init_options.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
index 8b6a74d7a..edd7f9f58 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
@@ -16,7 +16,7 @@ classes:
   - system.ceilometer.client.cinder_volume
   - system.ceilometer.agent.polling.default
   - system.linux.system.repo.mcp.openstack
-  - cluster.mcp-pike-common-noha.openstack_compute_pdf
+  - cluster.mcp-common-noha.openstack_compute_pdf
 parameters:
   _param:
     interface_mtu: 9000
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2
index 64af148fd..64af148fd 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
index 29b2d627e..c4915c795 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
@@ -18,6 +18,7 @@ classes:
   - system.keystone.server.wsgi
   - system.keystone.server.single
   - system.keystone.client.single
+  - system.keystone.client.v3.service.keystone
   - system.keystone.client.service.nova21
   - system.keystone.client.service.nova-placement
   - system.keystone.client.service.cinder3
@@ -56,8 +57,8 @@ classes:
   - system.apache.server.site.panko
   - system.horizon.server.single
   - service.haproxy.proxy.single
-  - cluster.mcp-pike-common-noha.haproxy_openstack_api
-  - cluster.mcp-pike-common-noha.openstack_control_pdf
+  - cluster.mcp-common-noha.haproxy_openstack_api
+  - cluster.mcp-common-noha.openstack_control_pdf
 parameters:
   _param:
     linux_system_codename: xenial
@@ -77,6 +78,21 @@ parameters:
         - python-psycopg2
         - python-mysqldb
         - python-openstackclient
+        - python-tornado
+    client:
+      enabled: true
+      resources:
+        v3:
+          enabled: true
+      server:
+        identity:
+          admin:
+            api_version: 3
+        admin_identity:
+          admin:
+            api_version: ''
+            user_domain_name: 'Default'
+            project_domain_name: 'Default'
   glance:
     server:
       storage:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2
index 8219637dc..8219637dc 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
index 5edf48c31..0062adf16 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
@@ -8,7 +8,7 @@
 ---
 classes:
   - system.linux.system.repo.mcp.openstack
-  - cluster.mcp-pike-common-noha.openstack_gateway_pdf
+  - cluster.mcp-common-noha.openstack_gateway_pdf
 parameters:
   _param:
     interface_mtu: 9000
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
index 7067d59a4..7067d59a4 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml
index ff99b9b42..f76333374 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml
@@ -8,7 +8,7 @@
 ---
 parameters:
   _param:
-    openstack_version: pike
+    openstack_version: queens
     apt_mk_version: nightly
     mcp_repo_version: 1.1
     openstack_region: RegionOne
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2
index 46e25fe95..43e8c1f39 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2
@@ -9,8 +9,8 @@
 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.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:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/init.yml
index 1bdcbd225..a80228ccd 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/init.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-common-noha.infra
+  - cluster.mcp-common-noha.infra
 
 parameters:
   _param:
-    cluster_name: mcp-pike-odl-noha
+    cluster_name: mcp-odl-noha
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/init.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml
index d770e7895..a595bf0b5 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml
@@ -8,9 +8,9 @@
 ---
 classes:
   - system.linux.system.single
-  - cluster.mcp-pike-common-noha.init_options
-  - cluster.mcp-pike-odl-noha.infra
-  - cluster.mcp-pike-odl-noha.openstack
+  - cluster.mcp-common-noha.init_options
+  - cluster.mcp-odl-noha.infra
+  - cluster.mcp-odl-noha.openstack
 
 parameters:
   _param:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml
index 8854fc2bf..0b513f065 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml
@@ -10,8 +10,8 @@ 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
+  - cluster.mcp-odl-noha
+  - cluster.mcp-odl-noha.opendaylight.control_pdf
 parameters:
   _param:
     linux_system_codename: xenial
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2
index fbb7de8b3..fbb7de8b3 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
index 12dfdcaa1..d0ee3a3e0 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
@@ -13,8 +13,8 @@ classes:
   - system.nova.compute.nfv.hugepages
   - system.neutron.compute.nfv.dpdk
 {%- endif %}
-  - cluster.mcp-pike-common-noha.openstack_compute
-  - cluster.mcp-pike-odl-noha
+  - cluster.mcp-common-noha.openstack_compute
+  - cluster.mcp-odl-noha
 parameters:
   linux:
     network:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml
index 4c48d0798..f5ed2dc5d 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - system.neutron.control.opendaylight.single
-  - cluster.mcp-pike-common-noha.openstack_control
-  - cluster.mcp-pike-odl-noha
+  - cluster.mcp-common-noha.openstack_control
+  - cluster.mcp-odl-noha
 parameters:
   haproxy:
     proxy:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml
index f4f646160..e554eb6b6 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml
@@ -7,9 +7,9 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-common-noha.openstack_gateway
+  - cluster.mcp-common-noha.openstack_gateway
   - service.neutron.gateway.opendaylight.single
-  - cluster.mcp-pike-odl-noha
+  - cluster.mcp-odl-noha
 parameters:
   linux:
     network:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml
index 2cd3083ff..91e002667 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-common-noha.openstack_init
+  - cluster.mcp-common-noha.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vxlan"
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/infra/config.yml
index 399ffc21a..05f289b3a 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/infra/config.yml
@@ -7,5 +7,5 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-common-noha.infra.config
-  - cluster.mcp-pike-ovn-noha
+  - cluster.mcp-common-noha.infra.config
+  - cluster.mcp-ovn-noha
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/infra/init.yml
index 54b50d2a8..229ebb5e5 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/infra/init.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-common-noha.infra
+  - cluster.mcp-common-noha.infra
 
 parameters:
   _param:
-    cluster_name: mcp-pike-ovs-noha
+    cluster_name: mcp-ovn-noha
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml
index b3aa40415..d4b6d85b7 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml
@@ -8,6 +8,6 @@
 ---
 classes:
   - system.linux.system.single
-  - cluster.mcp-pike-common-noha.init_options
-  - cluster.mcp-pike-ovn-noha.infra
-  - cluster.mcp-pike-ovn-noha.openstack
+  - cluster.mcp-common-noha.init_options
+  - cluster.mcp-ovn-noha.infra
+  - cluster.mcp-ovn-noha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml
index ad8658518..f8183e7f8 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - service.neutron.compute.ovn.single
-  - cluster.mcp-pike-common-noha.openstack_compute
-  - cluster.mcp-pike-ovn-noha
+  - cluster.mcp-common-noha.openstack_compute
+  - cluster.mcp-ovn-noha
 parameters:
   neutron:
     compute:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/control.yml
index 3d120ca9f..235beff26 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/control.yml
@@ -8,5 +8,5 @@
 ---
 classes:
   - system.neutron.control.ovn.single
-  - cluster.mcp-pike-common-noha.openstack_control
-  - cluster.mcp-pike-ovn-noha
+  - cluster.mcp-common-noha.openstack_control
+  - cluster.mcp-ovn-noha
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/init.yml
index 03d46ef91..cba6b7741 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/init.yml
@@ -7,4 +7,4 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-common-noha.openstack_init
+  - cluster.mcp-common-noha.openstack_init
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/config.yml
index baf072fd8..08c23026f 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/config.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - system.reclass.storage.system.openstack_gateway_single
-  - cluster.mcp-pike-common-noha.infra.config
-  - cluster.mcp-pike-ovs-dpdk-noha
+  - cluster.mcp-common-noha.infra.config
+  - cluster.mcp-ovs-dpdk-noha
   - cluster.all-mcp-arch-common.infra.config_dpdk_pdf
 parameters:
   reclass:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/init.yml
index cf43fa8e3..f27c310ac 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/init.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-common-noha.infra
+  - cluster.mcp-common-noha.infra
 
 parameters:
   _param:
-    cluster_name: mcp-pike-ovn-noha
+    cluster_name: mcp-ovs-dpdk-noha
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml
index 94267fad4..96e2c9425 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml
@@ -8,6 +8,6 @@
 ---
 classes:
   - system.linux.system.single
-  - cluster.mcp-pike-common-noha.init_options
-  - cluster.mcp-pike-ovs-noha.infra
-  - cluster.mcp-pike-ovs-noha.openstack
+  - cluster.mcp-common-noha.init_options
+  - cluster.mcp-ovs-dpdk-noha.infra
+  - cluster.mcp-ovs-dpdk-noha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml
index 53ba74592..a4d6b8dd2 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml
@@ -10,8 +10,8 @@ classes:
   - system.nova.compute.nfv.hugepages
   - system.neutron.compute.nfv.dpdk
   - service.neutron.compute.single
-  - cluster.mcp-pike-common-noha.openstack_compute
-  - cluster.mcp-pike-ovs-dpdk-noha
+  - cluster.mcp-common-noha.openstack_compute
+  - cluster.mcp-ovs-dpdk-noha
 parameters:
   neutron:
     compute:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/control.yml
index 4be308d0e..bbd4d7cc2 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/control.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - system.neutron.control.openvswitch.single
-  - cluster.mcp-pike-common-noha.openstack_control
-  - cluster.mcp-pike-ovs-dpdk-noha
+  - cluster.mcp-common-noha.openstack_control
+  - cluster.mcp-ovs-dpdk-noha
 parameters:
   neutron:
     server:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml
index e7c077528..2f9aee6fd 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml
@@ -7,9 +7,9 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-common-noha.openstack_gateway
+  - cluster.mcp-common-noha.openstack_gateway
   - service.neutron.gateway.single
-  - cluster.mcp-pike-ovs-dpdk-noha
+  - cluster.mcp-ovs-dpdk-noha
 parameters:
   neutron:
     gateway:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/init.yml
index 9ef4b1b31..835d15a41 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/init.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-common-noha.openstack_init
+  - cluster.mcp-common-noha.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vlan"
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/infra/config.yml
index 4f7428207..6835a2622 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/infra/config.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - system.reclass.storage.system.openstack_gateway_single
-  - cluster.mcp-pike-common-noha.infra.config
-  - cluster.mcp-pike-ovs-noha
+  - cluster.mcp-common-noha.infra.config
+  - cluster.mcp-ovs-noha
   - cluster.all-mcp-arch-common.infra.config_pdf
 parameters:
   reclass:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/infra/init.yml
index d8cb01596..564061762 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/infra/init.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-common-noha.infra
+  - cluster.mcp-common-noha.infra
 
 parameters:
   _param:
-    cluster_name: mcp-pike-ovs-dpdk-noha
+    cluster_name: mcp-ovs-noha
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml
index 8d3a7a588..a453af50b 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml
@@ -8,6 +8,6 @@
 ---
 classes:
   - system.linux.system.single
-  - cluster.mcp-pike-common-noha.init_options
-  - cluster.mcp-pike-ovs-dpdk-noha.infra
-  - cluster.mcp-pike-ovs-dpdk-noha.openstack
+  - cluster.mcp-common-noha.init_options
+  - cluster.mcp-ovs-noha.infra
+  - cluster.mcp-ovs-noha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml
index 1a8bbd801..beddc4ae8 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - service.neutron.compute.single
-  - cluster.mcp-pike-common-noha.openstack_compute
-  - cluster.mcp-pike-ovs-noha
+  - cluster.mcp-common-noha.openstack_compute
+  - cluster.mcp-ovs-noha
 parameters:
   linux:
     network:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml
index 9b699b6b1..939cb2834 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml
@@ -8,5 +8,5 @@
 ---
 classes:
   - system.neutron.control.openvswitch.single
-  - cluster.mcp-pike-common-noha.openstack_control
-  - cluster.mcp-pike-ovs-noha
+  - cluster.mcp-common-noha.openstack_control
+  - cluster.mcp-ovs-noha
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/gateway.yml
index ff0b79a1f..b5dfcd40d 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/gateway.yml
@@ -7,9 +7,9 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-common-noha.openstack_gateway
+  - cluster.mcp-common-noha.openstack_gateway
   - service.neutron.gateway.single
-  - cluster.mcp-pike-ovs-noha
+  - cluster.mcp-ovs-noha
 parameters:
   linux:
     network:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/init.yml
index e94c4a00d..79e231825 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/init.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-common-noha.openstack_init
+  - cluster.mcp-common-noha.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vxlan"
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2
index 7f3839e82..21639e3bc 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2
@@ -15,7 +15,7 @@ parameters:
   _param:
     apt_mk_version: nightly
     mcp_repo_version: 1.1
-    salt_version: 2016.11
+    salt_version: 2017.7
     cluster_domain: ${_param:cluster_name}.local
     # stacklight_environment: ${_param:cluster_domain}
     reclass_data_revision: master
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
index 238ae95a3..793a7efa5 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
@@ -42,7 +42,7 @@ parameters:
         network_discovery: 'enabled'
         default_min_hwe_kernel: ${_param:hwe_kernel}
     cluster:
-      saltstack_repo_xenial: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/ xenial main"
+      saltstack_repo_xenial: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/ xenial main"
   linux:
     network:
       interface:
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
-Subproject 198b5b7459c9f602ded773e966888705d866f6d
+Subproject 3d227a7e3be6d3da6a459cc8254637be2228d1f
diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-odl-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-odl-noha.local.yml
index a4a21ba6a..4fd327242 100644
--- a/mcp/reclass/nodes/cfg01.mcp-pike-odl-noha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-odl-noha.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-odl-noha.infra.config
+  - cluster.mcp-odl-noha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: mcp-pike-odl-noha.local
+      domain: mcp-odl-noha.local
diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovn-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-ovn-noha.local.yml
index 0df357a26..6ae0367b9 100644
--- a/mcp/reclass/nodes/cfg01.mcp-pike-ovn-noha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-ovn-noha.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-ovn-noha.infra.config
+  - cluster.mcp-ovn-noha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: mcp-pike-ovn-noha.local
+      domain: mcp-ovn-noha.local
diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-noha.local.yml
index 793e7c0d4..30b61848e 100644
--- a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-noha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-noha.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-ovs-noha.infra.config
+  - cluster.mcp-ovs-dpdk-noha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: mcp-pike-ovs-noha.local
+      domain: mcp-ovs-dpdk-noha.local
diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-ovs-noha.local.yml
index 394a9f6b6..658061b26 100644
--- a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-noha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-ovs-noha.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-ovs-dpdk-noha.infra.config
+  - cluster.mcp-ovs-noha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: mcp-pike-ovs-dpdk-noha.local
+      domain: mcp-ovs-noha.local
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 2224d660a..14581bacb 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -80,9 +80,9 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
   export DEBIAN_FRONTEND=noninteractive
   echo 'Dpkg::Use-Pty "0";' > /etc/apt/apt.conf.d/90silence-dpkg
   OLD_DOMAIN=\$(grep -sPzo "id: cfg01\.\K(\S*)" /etc/salt/minion.d/minion.conf) || true
-  BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.11 " \
+  BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2017.7 " \
     MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly \
-      EXTRA_FORMULAS="nfs panko gnocchi" \
+      EXTRA_FORMULAS="nfs panko gnocchi oslo-templates" \
         ./salt-master-init.sh
   salt-key -Ay