54 files changed, 99 insertions, 151 deletions

diff --git a/ci/deploy.sh b/ci/deploy.sh
index e2e4a1c6f..10703f3c0 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -377,7 +377,7 @@ done
 virtual_repos_pkgs=${virtual_repos_pkgs%^}
 
 # Expand reclass and virsh network templates
-for tp in "${RECLASS_CLUSTER_DIR}/all-mcp-ocata-common/opnfv/"*.template \
+for tp in "${RECLASS_CLUSTER_DIR}/all-mcp-arch-common/opnfv/"*.template \
     net_*.template; do
         eval "cat <<-EOF
 		$(<"${tp}")
diff --git a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
index 2f4d401db..0302464b6 100644
--- a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
+++ b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: virtual-mcp-ocata-ovs.local
+  domain: virtual-mcp-pike-ovs.local
   states:
     - openstack
     - neutron_compute
diff --git a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
index a1a9e4175..02ab5b2c3 100644
--- a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
+++ b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: virtual-mcp-ocata-ovs-dpdk.local
+  domain: virtual-mcp-pike-ovs-dpdk.local
   states:
     - dpdk
     - openstack
diff --git a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
index 78923531d..c9285abb7 100644
--- a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
+++ b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: virtual-mcp-ocata-odl-router.local
+  domain: virtual-mcp-pike-odl.local
   states:
     - opendaylight
     - openstack
diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack
index 369e16504..1578dcffc 100755
--- a/mcp/config/states/openstack
+++ b/mcp/config/states/openstack
@@ -20,8 +20,10 @@ salt -I 'mysql:server' state.sls mysql
 salt -I 'memcached:server' state.sls memcached
 salt -I 'haproxy:proxy' state.sls haproxy
 
-salt -I 'keystone:server' state.sls keystone.server
+set +e; salt -I 'keystone:server' state.sls keystone.server; set -e
 salt -I 'keystone:server' service.restart apache2
+salt -I 'keystone:server' state.sls keystone.server
+
 salt -I 'keystone:server' state.sls keystone.client
 salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list"
 
@@ -41,7 +43,7 @@ salt -I 'neutron:gateway' state.sls neutron
 
 salt -I 'nova:compute' state.sls nova
 
-salt -I 'mongodb:server' state.sls mongodb
+salt -I 'mongodb:server' state.sls mongodb || salt -I 'mongodb:server' state.sls mongodb
 salt -I 'aodh:server' state.sls aodh
 salt -I 'ceilometer:server' state.sls ceilometer
 salt -I 'ceilometer:agent' state.sls ceilometer
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index c355126f7..b08a31ce6 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -80,3 +80,6 @@ wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_US
 # Disable proxy dhcp routes after installation
 salt -C 'prx*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \
   args='unset new_routers'
+salt -C 'prx*' system.reboot
+wait_for 30 "! salt -C 'prx*' test.ping | " \
+  "tee /dev/stderr | grep -Fq 'Not connected'"
diff --git a/mcp/patches/0013-maas-region-Allow-subnets-without-fabrics.patch b/mcp/patches/0013-maas-region-Allow-subnets-without-fabrics.patch
deleted file mode 100644
index 1f55dc696..000000000
--- a/mcp/patches/0013-maas-region-Allow-subnets-without-fabrics.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 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
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Thu, 23 Nov 2017 03:33:01 +0200
-Subject: [PATCH] maas: region: Allow subnets without fabrics
-
-Configuring subnets should be possible without explicitly configuring
-fabrics.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
-
-diff --git a/maas/region.sls b/maas/region.sls
---- a/maas/region.sls
-+++ b/maas/region.sls
-@@ -186,7 +186,9 @@
-   - name: maas.process_subnets
-   - require:
-     - module: maas_config
-+    {%- if region.get('fabrics', False)  %}
-     - module: maas_fabrics
-+    {%- endif %}
- {%- endif %}
-
- {%- if region.get('devices', False)  %}
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index 6358109ce..d0bb7c431 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -17,4 +17,3 @@
 /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
 /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch
 /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
-/usr/share/salt-formulas/env: 0013-maas-region-Allow-subnets-without-fabrics.patch
diff --git a/mcp/reclass/classes/cluster/README.rst b/mcp/reclass/classes/cluster/README.rst
index 3fec9b0f2..6f7d06c30 100644
--- a/mcp/reclass/classes/cluster/README.rst
+++ b/mcp/reclass/classes/cluster/README.rst
@@ -10,14 +10,14 @@ Overview
 
 #. Common classes (baremetal + virtual)
 
-   - all-mcp-ocata-common
+   - all-mcp-arch-common
 
 #. Common classes (specific to either baremetal or virtual deploys)
 
-   - baremetal-mcp-ocata-common
-   - virtual-mcp-ocata-common
+   - baremetal-mcp-<release>-common
+   - virtual-mcp-<release>-common
 
 #. Cluster specific classes
 
-   - baremetal-mcp-ocata-*
-   - virtual-mcp-ocata-*
+   - baremetal-mcp-<release>-*
+   - virtual-mcp-<release>-*
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml
index 0350afa3d..0350afa3d 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml
index 3f57713fe..f09ee5db1 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml
@@ -7,5 +7,5 @@
 ##############################################################################
 ---
 classes:
-  - cluster.all-mcp-ocata-common.arch
-  - cluster.all-mcp-ocata-common.opnfv
+  - cluster.all-mcp-arch-common.arch
+  - cluster.all-mcp-arch-common.opnfv
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/.gitignore b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/.gitignore
index bf6a84be7..bf6a84be7 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/.gitignore
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/.gitignore
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml
index aa780e631..28dcdcd5b 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml
@@ -7,5 +7,5 @@
 ##############################################################################
 ---
 classes:
-  - cluster.all-mcp-ocata-common.opnfv.runtime
-  - cluster.all-mcp-ocata-common.opnfv.pod_config
+  - cluster.all-mcp-arch-common.opnfv.runtime
+  - cluster.all-mcp-arch-common.opnfv.pod_config
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml
index d72df2eb6..d72df2eb6 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example
index e5b852f32..e5b852f32 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml
index 4fd9e0368..4fd9e0368 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template
index 1445917e6..1445917e6 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml
index 867ccb782..a9a774bbb 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml
@@ -8,7 +8,7 @@
 ---
 parameters:
   _param:
-    salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2
+    salt_control_xenial_image: http://images.mirantis.com.s3.amazonaws.com/ubuntu-16-04-x64-latest.qcow2
 
     # VMs spawned on Foundation Node / Jump Host net ifaces (max 4)
     opnfv_fn_vm_primary_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
index 3d3f8df62..55160bd6b 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
@@ -8,7 +8,7 @@
 ---
 classes:
   - system.linux.system.single
-  - cluster.all-mcp-ocata-common
+  - cluster.all-mcp-arch-common
   # - cluster.baremetal-mcp-ocata-common.stacklight
   # - cluster.baremetal-mcp-ocata-common.stacklight.client
 parameters:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml
index bd8e46907..474ee6d70 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml
@@ -7,6 +7,6 @@
 ##############################################################################
 ---
 classes:
-  - cluster.all-mcp-ocata-common
+  - cluster.all-mcp-arch-common
   - cluster.baremetal-mcp-ocata-odl-ha.infra
   - cluster.baremetal-mcp-ocata-odl-ha.openstack
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml
index cd8eebae5..5f05c05b8 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml
@@ -7,6 +7,6 @@
 ##############################################################################
 ---
 classes:
-  - cluster.all-mcp-ocata-common
+  - cluster.all-mcp-arch-common
   - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
   - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml
index b15c8c3a8..1c2952456 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml
@@ -7,6 +7,6 @@
 ##############################################################################
 ---
 classes:
-  - cluster.all-mcp-ocata-common
+  - cluster.all-mcp-arch-common
   - cluster.baremetal-mcp-ocata-ovs-ha.infra
   - cluster.baremetal-mcp-ocata-ovs-ha.openstack
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/haproxy_openstack_api.yml
index 649b75c8c..649b75c8c 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/haproxy_openstack_api.yml
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/infra/config.yml
index 3c3d5260a..3c3d5260a 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/infra/config.yml
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/infra/init.yml
index 2385411b4..2385411b4 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/infra/init.yml
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/init_options.yml
index 9540b9436..9540b9436 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/init_options.yml
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_compute.yml
index ad0675475..35c23fef7 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_compute.yml
@@ -62,12 +62,6 @@ parameters:
           device: ${_param:openstack_control_address}:/srv/nova/instances
   linux:
     system:
-      repo:
-        uca:
-          source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
-          architectures: amd64
-          key_id: EC4926EA
-          key_server: keyserver.ubuntu.com
       kernel:
         sysctl:
           vm.dirty_ratio: 10
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_control.yml
index ab5833910..458765020 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_control.yml
@@ -8,7 +8,6 @@
 ---
 classes:
   - system.linux.system.lowmem
-  - system.linux.system.repo.mcp.openstack
   - system.linux.system.repo.mcp.extra
   - service.nfs.server
   - system.mongodb.server.single
@@ -45,7 +44,7 @@ classes:
   - system.aodh.server.single
   - system.horizon.server.single
   - service.haproxy.proxy.single
-  - cluster.virtual-mcp-ocata-common.haproxy_openstack_api
+  - cluster.virtual-mcp-pike-common.haproxy_openstack_api
 parameters:
   _param:
     linux_system_codename: xenial
@@ -73,17 +72,6 @@ parameters:
   keystone:
     server:
       admin_email: ${_param:admin_email}
-      pkgs:
-        - keystone
-        - python-keystone
-        - python-keystoneclient
-        - python-psycopg2
-        - python-mysqldb
-        - python-six
-        - python-memcache
-        - python-openstackclient
-        - gettext-base
-        - python-pycadf
   glance:
     server:
       storage:
@@ -102,6 +90,15 @@ parameters:
         novncproxy_port: 6080
       vncproxy_url: http://${_param:cluster_vip_address}:6080
       workers: 1
+      pkgs:
+        - nova-common
+        - nova-novncproxy
+        - novnc
+        - nova-api
+        - nova-conductor
+        - nova-consoleauth
+        - nova-scheduler
+        - python-novaclient
   horizon:
     server:
       # yamllint disable-line rule:truthy
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml
index 4ed8eed77..7d5313444 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml
@@ -7,7 +7,6 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.openstack
   - system.linux.system.repo.mcp.extra
 parameters:
   _param:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_init.yml
index 81f050f89..e3ae40505 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_init.yml
@@ -8,7 +8,7 @@
 ---
 parameters:
   _param:
-    openstack_version: ocata
+    openstack_version: pike
     apt_mk_version: nightly
     mcp_repo_version: 1.1
     openstack_region: RegionOne
@@ -95,6 +95,12 @@ parameters:
     aodh_service_host: ${_param:cluster_local_address}
   linux:
     system:
+      repo:
+        uca:
+          source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/pike main"
+          architectures: amd64
+          key_id: EC4926EA
+          key_server: keyserver.ubuntu.com
       kernel:
         sysctl:
           net.ipv4.tcp_congestion_control: yeah
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/infra/config.yml
index 24c302869..4fd8e75c8 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/infra/config.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - system.reclass.storage.system.opendaylight_control_single
-  - cluster.virtual-mcp-ocata-common.infra.config
-  - cluster.virtual-mcp-ocata-odl-router
+  - cluster.virtual-mcp-pike-common.infra.config
+  - cluster.virtual-mcp-pike-odl
 parameters:
   reclass:
     storage:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/init.yml
index 980ea1b0b..8501f032c 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/init.yml
@@ -8,13 +8,13 @@
 ---
 classes:
   - system.linux.system.single
-  - cluster.all-mcp-ocata-common
-  - cluster.virtual-mcp-ocata-common.init_options
-  - cluster.virtual-mcp-ocata-common.infra
-  - cluster.virtual-mcp-ocata-odl-router.openstack
+  - cluster.all-mcp-arch-common
+  - cluster.virtual-mcp-pike-common.init_options
+  - cluster.virtual-mcp-pike-common.infra
+  - cluster.virtual-mcp-pike-odl.openstack
 
 parameters:
   _param:
-    cluster_domain: virtual-mcp-ocata-odl-router.local
-    cluster_name: virtual-mcp-ocata-odl-router
+    cluster_domain: virtual-mcp-pike-odl.local
+    cluster_name: virtual-mcp-pike-odl
     opendaylight_service_host: 172.16.10.111
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/opendaylight/control.yml
index f75cd3300..58b461ef9 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/opendaylight/control.yml
@@ -10,7 +10,7 @@ classes:
   - system.linux.system.repo.mcp.openstack
   - system.linux.system.repo.mcp.extra
   - system.opendaylight.server.single
-  - cluster.virtual-mcp-ocata-odl-router
+  - cluster.virtual-mcp-pike-odl
 parameters:
   _param:
     linux_system_codename: xenial
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/compute.yml
index f6f26be67..34416f658 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/compute.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-ocata-common.openstack_compute
-  - cluster.virtual-mcp-ocata-odl-router
+  - cluster.virtual-mcp-pike-common.openstack_compute
+  - cluster.virtual-mcp-pike-odl
 parameters:
   opendaylight:
     client:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/control.yml
index a0ace9601..f904d64c3 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/control.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - system.neutron.control.opendaylight.single
-  - cluster.virtual-mcp-ocata-common.openstack_control
-  - cluster.virtual-mcp-ocata-odl-router
+  - cluster.virtual-mcp-pike-common.openstack_control
+  - cluster.virtual-mcp-pike-odl
 parameters:
   neutron:
     server:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/gateway.yml
index 231413a19..00725e9b0 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/gateway.yml
@@ -7,9 +7,9 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-ocata-common.openstack_gateway
+  - cluster.virtual-mcp-pike-common.openstack_gateway
   - system.neutron.gateway.opendaylight.single
-  - cluster.virtual-mcp-ocata-odl-router
+  - cluster.virtual-mcp-pike-odl
 parameters:
   _param:
     neutron_agents:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/init.yml
index 5be63e51b..906d79a67 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/init.yml
@@ -7,19 +7,12 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-ocata-common.openstack_init
+  - cluster.virtual-mcp-pike-common.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vxlan"
     opendaylight_router: odl-router_v2
   linux:
-    system:
-      repo:
-        uca:
-          source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
-          architectures: amd64
-          key_id: EC4926EA
-          key_server: keyserver.ubuntu.com
     network:
       host:
         odl01:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/infra/config.yml
index ef0735743..a346bacab 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/infra/config.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-ocata-common.infra.config
-  - cluster.virtual-mcp-ocata-ovs-dpdk
+  - cluster.virtual-mcp-pike-common.infra.config
+  - cluster.virtual-mcp-pike-ovs-dpdk
 parameters:
   reclass:
     storage:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/init.yml
index 588e8bee0..66d5e3fbd 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/init.yml
@@ -8,12 +8,12 @@
 ---
 classes:
   - system.linux.system.single
-  - cluster.all-mcp-ocata-common
-  - cluster.virtual-mcp-ocata-common.init_options
-  - cluster.virtual-mcp-ocata-common.infra
-  - cluster.virtual-mcp-ocata-ovs-dpdk.openstack
+  - cluster.all-mcp-arch-common
+  - cluster.virtual-mcp-pike-common.init_options
+  - cluster.virtual-mcp-pike-common.infra
+  - cluster.virtual-mcp-pike-ovs-dpdk.openstack
 
 parameters:
   _param:
-    cluster_domain: virtual-mcp-ocata-ovs-dpdk.local
-    cluster_name: virtual-mcp-ocata-ovs-dpdk
+    cluster_domain: virtual-mcp-pike-ovs-dpdk.local
+    cluster_name: virtual-mcp-pike-ovs-dpdk
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml
index ba6577e0d..72fe43a84 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml
@@ -11,8 +11,8 @@ classes:
   - system.linux.system.repo.mcp.extra
   - system.nova.compute.nfv.hugepages
   - system.neutron.compute.nfv.dpdk
-  - cluster.virtual-mcp-ocata-common.openstack_compute
-  - cluster.virtual-mcp-ocata-ovs-dpdk
+  - cluster.virtual-mcp-pike-common.openstack_compute
+  - cluster.virtual-mcp-pike-ovs-dpdk
 parameters:
   neutron:
     compute:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/control.yml
index 780f66427..b368a2c68 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/control.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - system.neutron.control.openvswitch.single
-  - cluster.virtual-mcp-ocata-common.openstack_control
-  - cluster.virtual-mcp-ocata-ovs-dpdk
+  - cluster.virtual-mcp-pike-common.openstack_control
+  - cluster.virtual-mcp-pike-ovs-dpdk
 parameters:
   neutron:
     server:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/gateway.yml
index 4f215e807..07691fbf7 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/gateway.yml
@@ -7,9 +7,9 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-ocata-common.openstack_gateway
+  - cluster.virtual-mcp-pike-common.openstack_gateway
   - service.neutron.gateway.single
-  - cluster.virtual-mcp-ocata-ovs-dpdk
+  - cluster.virtual-mcp-pike-ovs-dpdk
 parameters:
   neutron:
     gateway:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/init.yml
index c27f73b05..02d24caac 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/init.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-ocata-common.openstack_init
+  - cluster.virtual-mcp-pike-common.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vlan"
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
index 8505e3503..788fd2ffd 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
@@ -7,5 +7,5 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-ocata-common.infra.config
-  - cluster.virtual-mcp-ocata-ovs
+  - cluster.virtual-mcp-pike-common.infra.config
+  - cluster.virtual-mcp-pike-ovs
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/init.yml
index 56e676ba9..528125b30 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/init.yml
@@ -8,12 +8,12 @@
 ---
 classes:
   - system.linux.system.single
-  - cluster.all-mcp-ocata-common
-  - cluster.virtual-mcp-ocata-common.init_options
-  - cluster.virtual-mcp-ocata-common.infra
-  - cluster.virtual-mcp-ocata-ovs.openstack
+  - cluster.all-mcp-arch-common
+  - cluster.virtual-mcp-pike-common.init_options
+  - cluster.virtual-mcp-pike-common.infra
+  - cluster.virtual-mcp-pike-ovs.openstack
 
 parameters:
   _param:
-    cluster_domain: virtual-mcp-ocata-ovs.local
-    cluster_name: virtual-mcp-ocata-ovs
+    cluster_domain: virtual-mcp-pike-ovs.local
+    cluster_name: virtual-mcp-pike-ovs
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
index c9fee8842..ea64da140 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-ocata-common.openstack_compute
-  - cluster.virtual-mcp-ocata-ovs
+  - cluster.virtual-mcp-pike-common.openstack_compute
+  - cluster.virtual-mcp-pike-ovs
 parameters:
   linux:
     network:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
index 17250c338..070e48880 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
@@ -8,5 +8,5 @@
 ---
 classes:
   - system.neutron.control.openvswitch.single
-  - cluster.virtual-mcp-ocata-common.openstack_control
-  - cluster.virtual-mcp-ocata-ovs
+  - cluster.virtual-mcp-pike-common.openstack_control
+  - cluster.virtual-mcp-pike-ovs
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
index 50c0f6e4d..fe2f01281 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
@@ -7,9 +7,9 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-ocata-common.openstack_gateway
+  - cluster.virtual-mcp-pike-common.openstack_gateway
   - service.neutron.gateway.single
-  - cluster.virtual-mcp-ocata-ovs
+  - cluster.virtual-mcp-pike-ovs
 parameters:
   linux:
     network:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
index 4b083944a..5a4c444de 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-ocata-common.openstack_init
+  - cluster.virtual-mcp-pike-common.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vxlan"
diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml
deleted file mode 100644
index 2dc5e6a69..000000000
--- a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 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.virtual-mcp-ocata-odl-router.infra.config
-parameters:
-  _param:
-    linux_system_codename: xenial
-    reclass_data_revision: master
-  linux:
-    system:
-      name: cfg01
-      domain: virtual-mcp-ocata-odl-router.local
diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl.local.yml
index 0be4100f7..4b8e883cf 100644
--- a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml
+++ b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-ocata-ovs.infra.config
+  - cluster.virtual-mcp-pike-odl.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: virtual-mcp-ocata-ovs.local
+      domain: virtual-mcp-pike-odl.local
diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk.local.yml
index f87897a85..bf68ab88d 100644
--- a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml
+++ b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-ocata-ovs-dpdk.infra.config
+  - cluster.virtual-mcp-pike-ovs-dpdk.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: virtual-mcp-ocata-ovs-dpdk.local
+      domain: virtual-mcp-pike-ovs-dpdk.local
diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs.local.yml
index 19afe46b4..514946b1c 100644
--- a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl.local.yml
+++ b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-ocata-odl.infra.config
+  - cluster.virtual-mcp-pike-ovs.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: virtual-mcp-ocata-odl.local
+      domain: virtual-mcp-pike-ovs.local
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index b719aa8ae..59baaa530 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -17,7 +17,7 @@ F_GIT_SUBD=${F_GIT_ROOT#${F_GIT_DIR%%/.git*}}
 OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/opnfv"
 OPNFV_GIT_DIR="/root/opnfv"
 OPNFV_FUEL_DIR="/root/fuel"
-OPNFV_RDIR="reclass/classes/cluster/all-mcp-ocata-common"
+OPNFV_RDIR="reclass/classes/cluster/all-mcp-arch-common"
 OPNFV_VCP_IMG="mcp/scripts/base_image_opnfv_fuel_vcp.img"
 OPNFV_VCP_DIR="/srv/salt/env/prd/salt/files/control/images"
 LOCAL_GIT_DIR="${F_GIT_ROOT%${F_GIT_SUBD}}"
@@ -107,4 +107,8 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
     mkdir -p "${OPNFV_VCP_DIR}"
     mv "${OPNFV_FUEL_DIR}/${OPNFV_VCP_IMG}" "${OPNFV_VCP_DIR}/"
   fi
+
+  # symlink manually until package with required commit is available
+  cd /usr/share/salt-formulas/env/aodh/files
+  ln -s ocata pike
 SALT_INSTALL_END