summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/release/installation/installation.instruction.rst52
-rw-r--r--mcp/patches/patches.list1
-rw-r--r--mcp/patches/patches_neutron.list8
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml9
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml3
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml9
-rwxr-xr-xmcp/scripts/salt.sh5
7 files changed, 72 insertions, 15 deletions
diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst
index 46dba7864..652c85558 100644
--- a/docs/release/installation/installation.instruction.rst
+++ b/docs/release/installation/installation.instruction.rst
@@ -230,6 +230,27 @@ For virtual deploys all the targets are VMs on the Jumpserver. The deploy script
Fuel@OPNFV Virtual POD Network Layout Examples
+ +-----------------------+------------------------------------------------------------------------+
+ | cfg01 | Salt Master VM |
+ +-----------------------+------------------------------------------------------------------------+
+ | ctl01 | Controller VM |
+ +-----------------------+------------------------------------------------------------------------+
+ | cmp01/cmp02 | Compute VMs |
+ +-----------------------+------------------------------------------------------------------------+
+ | gtw01 | Gateway VM with neutron services (dhcp agent, L3 agent, metadata, etc) |
+ +-----------------------+------------------------------------------------------------------------+
+ | odl01 | VM on which ODL runs (for scenarios deployed with ODL) |
+ +-----------------------+------------------------------------------------------------------------+
+
+
+In this figure there are examples of two virtual deploys:
+ - Jumphost 1 has only virsh bridges, created by the deploy script
+ - Jumphost 2 has a mix of linux and virsh briges; when linux bridge exist for a specified network,
+ the deploy script will skip creating a virsh bridge for it
+
+**Note**: A virtual network "mcpcontrol" is always created. For virtual deploys, "mcpcontrol" is also used
+for PXE, leaving the PXE bridge unused.
+
Automatic Installation of a Baremetal POD
=========================================
@@ -254,6 +275,34 @@ The installation is done automatically with the deploy script, which will:
Fuel@OPNFV Baremetal POD Network Layout Example
+ +-----------------------+---------------------------------------------------------+
+ | cfg01 | Salt Master VM |
+ +-----------------------+---------------------------------------------------------+
+ | mas01 | MaaS Node VM |
+ +-----------------------+---------------------------------------------------------+
+ | kvm01..03 | Baremetals which hold the VMs with controller functions |
+ +-----------------------+---------------------------------------------------------+
+ | cmp001/cmp002 | Baremetal compute nodes |
+ +-----------------------+---------------------------------------------------------+
+ | prx01/prx02 | Proxy VMs for Nginx |
+ +-----------------------+---------------------------------------------------------+
+ | msg01..03 | RabbitMQ Service VMs |
+ +-----------------------+---------------------------------------------------------+
+ | dbs01..03 | MySQL service VMs |
+ +-----------------------+---------------------------------------------------------+
+ | mdb01..03 | Telemetry VMs |
+ +-----------------------+---------------------------------------------------------+
+ | odl01 | VM on which ODL runs (for scenarios deployed with ODL) |
+ +-----------------------+---------------------------------------------------------+
+ | Tenant VM | VM running in the cloud |
+ +-----------------------+---------------------------------------------------------+
+
+In the baremetal deploy all bridges but "mcpcontrol" are linux bridges. For the Jumpserver, if they are already created
+they will be used; otherwise they will be created. For the targets, the bridges are created by the deploy script.
+
+**Note**: A virtual network "mcpcontrol" is always created. For baremetal deploys, PXE bridge is used for
+baremetal node provisioning, while "mcpcontrol" is used to provision the infrastructure VMs only.
+
Steps to Start the Automatic Deploy
===================================
@@ -375,7 +424,8 @@ are defined:
- Remote management parameters.
- Network interfaces list including mac address, speed and advanced features.
- IP list of fixed IPs for the node
-Note: the fixed IPs are ignored by the MCP installer script and it will instead
+
+**Note**: the fixed IPs are ignored by the MCP installer script and it will instead
assign based on the network ranges defined under the pod network configuration.
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 d93d9ee5b..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
@@ -41,6 +41,7 @@ parameters:
system:
package:
libapache2-mod-wsgi:
+ version: latest
salt:
minion:
cert:
@@ -49,7 +50,7 @@ parameters:
key_usage: 'digitalSignature, keyEncipherment'
apache:
server:
- modules: ~
+ modules: ''
horizon:
server:
bind:
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