9 files changed, 43 insertions, 20 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 5c2fec7bb..f4d334896 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -236,11 +236,6 @@ if [[ "$(sudo whoami)" != 'root' ]]; then
     exit 1
 fi
 
-if ! virsh list >/dev/null 2>&1; then
-    notify "[ERROR] This script requires hypervisor access\n" 1>&2
-    exit 1
-fi
-
 # Validate mandatory arguments are set
 if [ -z "${TARGET_LAB}" ] || [ -z "${TARGET_POD}" ] || \
    [ -z "${DEPLOY_SCENARIO}" ]; then
@@ -265,9 +260,11 @@ pushd "${DEPLOY_DIR}" > /dev/null
 
 # Install required packages
 [ -n "$(command -v apt-get)" ] && sudo apt-get install -y \
-  git make rsync mkisofs curl virtinst cpu-checker qemu-kvm uuid-runtime
+  git make rsync mkisofs curl virtinst cpu-checker qemu-kvm uuid-runtime \
+  libvirt-bin
 [ -n "$(command -v yum)" ] && sudo yum install -y --skip-broken \
-  git make rsync genisoimage curl virt-install qemu-kvm util-linux
+  git make rsync genisoimage curl virt-install qemu-kvm util-linux \
+  libvirt
 
 # For baremetal, python is indirectly required for PDF parsing
 if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then
@@ -277,6 +274,11 @@ if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then
     python python-ipaddress python-jinja2 python-yaml
 fi
 
+if ! virsh list >/dev/null 2>&1; then
+    notify "[ERROR] This script requires hypervisor access\n" 1>&2
+    exit 1
+fi
+
 # Clone git submodules and apply our patches
 make -C "${REPO_ROOT_PATH}/mcp/patches" deepclean patches-import
 
diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst
index e2d2be657..652c85558 100644
--- a/docs/release/installation/installation.instruction.rst
+++ b/docs/release/installation/installation.instruction.rst
@@ -191,6 +191,11 @@ installed on the Jumpserver:
    - CentOS 7 (recommended by Pharos specification);
    - Ubuntu Xenial;
 
+**NOTE:** The install script expects 'libvirt' to be installed and running
+on the Jumpserver. In case the packages are missing, the script will install
+them; but depending on the OS distribution, the user might have to start the
+'libvirtd' service manually.
+
 ==========================================
 OPNFV Software Installation and Deployment
 ==========================================
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index e816a9dcc..c3a51a85a 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -63,6 +63,7 @@ salt -I 'ceilometer:server' state.sls ceilometer
 salt -I 'ceilometer:agent' state.sls ceilometer
 
 salt -I 'horizon:server' state.sls horizon
+salt -I 'apache:server' state.sls apache
 salt -I 'nginx:server' state.sls nginx
 
 clstr_vip_addr=$(salt -C 'I@nginx:server and *01*' --out=yaml \
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index accdb6b09..fb5a14cda 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -5,6 +5,7 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+/usr/share/salt-formulas/env: 0001-opendaylight-formula-neutron.patch
 /usr/share/salt-formulas/env: 0002-maas-region-skip-credentials-update.patch
 /usr/share/salt-formulas/env: 0003-maas-region-force-artifact-download.patch
 /usr/share/salt-formulas/env: 0004-maas-region-use-authorized_keys-1st-entry.patch
diff --git a/mcp/patches/patches_neutron.list b/mcp/patches/patches_neutron.list
deleted file mode 100644
index e89bfe70f..000000000
--- a/mcp/patches/patches_neutron.list
+++ /dev/null
@@ -1,8 +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
-##############################################################################
-/usr/share/salt-formulas/env: 0001-opendaylight-formula-neutron.patch
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml
index e0f9a2a94..275941120 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml
@@ -47,6 +47,15 @@ parameters:
     master:
       accept_policy: open_mode
       file_recv: true
+      environment:
+        prd:
+          formula:
+            maas:
+              # Temporary fixup for MaaS formula machine status int.lower()
+              version: 0.0.1+201711061044.9f1b034~xenial1
+            neutron:
+              # Temporary fixup for mismatch between formula and reclass model
+              version: 2016.12.1+201709251458.f0607d9-1xenial1
   reclass:
     storage:
       data_source:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
index da3190815..a2d39854e 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
@@ -16,6 +16,7 @@ classes:
   - system.nginx.server.proxy.openstack.aodh
   - system.nginx.server.proxy.openstack.ceilometer
   - system.horizon.server.single
+  - system.apache.server.single
   - system.salt.minion.cert.proxy
   - system.sphinx.server.doc.reclass
   - service.keepalived.cluster.single
@@ -40,9 +41,17 @@ parameters:
     system:
       package:
         libapache2-mod-wsgi:
+          version: latest
   salt:
     minion:
       cert:
         proxy:
           alternative_names: "IP:${_param:openstack_proxy_address}"
           key_usage: 'digitalSignature, keyEncipherment'
+  apache:
+    server:
+      modules: ''
+  horizon:
+    server:
+      bind:
+        address: localhost
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
index 3c3d5260a..21ed8d329 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
@@ -43,6 +43,15 @@ parameters:
   salt:
     master:
       file_recv: true
+      environment:
+        prd:
+          formula:
+            maas:
+              # Temporary fixup for MaaS formula machine status int.lower()
+              version: 0.0.1+201711061044.9f1b034~xenial1
+            neutron:
+              # Temporary fixup for mismatch between formula and reclass model
+              version: 2016.12.1+201709251458.f0607d9-1xenial1
   reclass:
     storage:
       data_source:
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index fc6b101b9..a03d25fc4 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -69,9 +69,4 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
   salt -C '* and not cfg01*' pkg.upgrade refresh=False
 
   salt '*' state.sls ntp
-
-  # Temporary fixup for mismatch between neutron formula and reclass model
-  salt-call pkg.install salt-formula-neutron allow_updates=False refresh=False \
-    version=2016.12.1+201709251458.f0607d9-1xenial1
-  cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches_neutron.list formulas
 SALT_INSTALL_END