diff options
26 files changed, 223 insertions, 221 deletions
diff --git a/apex/builders/undercloud_builder.py b/apex/builders/undercloud_builder.py index 4efd00d5..ec75f3dc 100644 --- a/apex/builders/undercloud_builder.py +++ b/apex/builders/undercloud_builder.py @@ -9,7 +9,9 @@ # Used to modify undercloud qcow2 image import logging +import json import os +import subprocess from apex.common import constants as con from apex.common import utils @@ -34,7 +36,8 @@ def add_upstream_packages(image): 'openstack-tripleo-validations', 'libguestfs-tools', 'ceph-ansible', - 'python-tripleoclient' + 'python-tripleoclient', + 'openstack-tripleo-heat-templates' ] for pkg in pkgs: @@ -59,3 +62,45 @@ def inject_calipso_installer(tmp_dir, image): # TODO(trozet): add unit testing for calipso injector # TODO(trozet): add rest of build for undercloud here as well + + +def update_repos(image, branch): + virt_ops = [ + {con.VIRT_RUN_CMD: "rm -f /etc/yum.repos.d/delorean*"}, + {con.VIRT_RUN_CMD: "yum-config-manager --add-repo " + "https://trunk.rdoproject.org/centos7/{}" + "/delorean.repo".format(con.RDO_TAG)}, + {con.VIRT_INSTALL: "python2-tripleo-repos"}, + {con.VIRT_RUN_CMD: "tripleo-repos -b {} {} ceph".format(branch, + con.RDO_TAG)} + ] + virt_utils.virt_customize(virt_ops, image) + + +def expand_disk(image, desired_size=50): + """ + Expands a disk image to desired_size in GigaBytes + :param image: image to resize + :param desired_size: desired size in GB + :return: None + """ + # there is a lib called vminspect which has some dependencies and is + # not yet available in pip. Consider switching to this lib later. + try: + img_out = json.loads(subprocess.check_output( + ['qemu-img', 'info', '--output=json', image], + stderr=subprocess.STDOUT).decode()) + disk_gb_size = int(img_out['virtual-size'] / 1000000000) + if disk_gb_size < desired_size: + logging.info("Expanding disk image: {}. Current size: {} is less" + "than require size: {}".format(image, disk_gb_size, + desired_size)) + diff_size = desired_size - disk_gb_size + subprocess.check_call(['qemu-img', 'resize', image, + "+{}G".format(diff_size)], + stderr=subprocess.STDOUT) + + except (subprocess.CalledProcessError, json.JSONDecodeError, KeyError) \ + as e: + logging.warning("Unable to resize disk, disk may not be large " + "enough: {}".format(e)) diff --git a/apex/common/constants.py b/apex/common/constants.py index e0afbc0a..e89e7e75 100644 --- a/apex/common/constants.py +++ b/apex/common/constants.py @@ -49,11 +49,12 @@ PUPPET_ODL_URL = 'https://git.opendaylight.org/gerrit/integration/packaging' \ DEBUG_OVERCLOUD_PW = 'opnfvapex' NET_ENV_FILE = 'network-environment.yaml' DEPLOY_TIMEOUT = 120 -UPSTREAM_RDO = 'https://images.rdoproject.org/master/rdo_trunk/current' \ - '-tripleo-rdo/' +RDO_TAG = 'current-tripleo' +UPSTREAM_RDO = "https://images.rdoproject.org/master/rdo_trunk/{}/".format( + RDO_TAG) OPENSTACK_GERRIT = 'https://review.openstack.org' -DOCKER_TAG = 'current-tripleo-rdo' +DOCKER_TAG = RDO_TAG # Maps regular service files to docker versions # None value means mapping is same as key VALID_DOCKER_SERVICES = { diff --git a/apex/deploy.py b/apex/deploy.py index f1ab260f..b74d5292 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -44,6 +44,12 @@ from apex.overcloud import deploy as oc_deploy APEX_TEMP_DIR = tempfile.mkdtemp(prefix='apex_tmp') SDN_IMAGE = 'overcloud-full-opendaylight.qcow2' +UC_DISK_FILES = [ + 'overcloud-full.vmlinuz', + 'overcloud-full.initrd', + 'ironic-python-agent.initramfs', + 'ironic-python-agent.kernel' +] def validate_cross_settings(deploy_settings, net_settings, inventory): @@ -377,16 +383,26 @@ def main(): args.image_dir = os.path.join(args.image_dir, os_version) upstream_url = constants.UPSTREAM_RDO.replace( constants.DEFAULT_OS_VERSION, os_version) - upstream_targets = ['overcloud-full.tar', 'undercloud.qcow2'] + upstream_targets = ['overcloud-full.tar', 'ironic-python-agent.tar'] utils.fetch_upstream_and_unpack(args.image_dir, upstream_url, upstream_targets, fetch=not args.no_fetch) + # Copy ironic files and overcloud ramdisk and kernel into temp dir + # to be copied by ansible into undercloud /home/stack + # Note the overcloud disk does not need to be copied here as it will + # be modified and copied later + for tmp_file in UC_DISK_FILES: + shutil.copyfile(os.path.join(args.image_dir, tmp_file), + os.path.join(APEX_TEMP_DIR, tmp_file)) sdn_image = os.path.join(args.image_dir, 'overcloud-full.qcow2') # copy undercloud so we don't taint upstream fetch uc_image = os.path.join(args.image_dir, 'undercloud_mod.qcow2') - uc_fetch_img = os.path.join(args.image_dir, 'undercloud.qcow2') + uc_fetch_img = sdn_image shutil.copyfile(uc_fetch_img, uc_image) # prep undercloud with required packages + if platform.machine() != 'aarch64': + uc_builder.update_repos(image=uc_image, + branch=branch.replace('stable/', '')) uc_builder.add_upstream_packages(uc_image) uc_builder.inject_calipso_installer(APEX_TEMP_DIR, uc_image) # add patches from upstream to undercloud and overcloud @@ -421,7 +437,7 @@ def main(): os.path.join(APEX_TEMP_DIR, docker_env)) c_builder.prepare_container_images( os.path.join(APEX_TEMP_DIR, docker_env), - branch=branch, + branch=branch.replace('stable/', ''), neutron_driver=c_builder.get_neutron_driver(ds_opts) ) # Install Undercloud @@ -490,6 +506,8 @@ def main(): except Exception: logging.error("Unable to complete container prep on " "Undercloud") + for tmp_file in UC_DISK_FILES: + os.remove(os.path.join(APEX_TEMP_DIR, tmp_file)) os.remove(os.path.join(APEX_TEMP_DIR, 'overcloud-full.qcow2')) raise @@ -537,6 +555,8 @@ def main(): raise finally: os.remove(os.path.join(APEX_TEMP_DIR, 'overcloud-full.qcow2')) + for tmp_file in UC_DISK_FILES: + os.remove(os.path.join(APEX_TEMP_DIR, tmp_file)) # Post install logging.info("Executing post deploy configuration") diff --git a/apex/tests/test_apex_undercloud.py b/apex/tests/test_apex_undercloud.py index 2d0dffcb..14586528 100644 --- a/apex/tests/test_apex_undercloud.py +++ b/apex/tests/test_apex_undercloud.py @@ -10,6 +10,7 @@ import ipaddress import libvirt import os +import platform import subprocess import unittest @@ -239,13 +240,16 @@ class TestUndercloud(unittest.TestCase): assert_raises(ApexUndercloudException, uc.configure, ns, ds, 'playbook', '/tmp/dir') + @patch('apex.undercloud.undercloud.virt_utils') + @patch('apex.undercloud.undercloud.uc_builder') @patch('apex.undercloud.undercloud.os.remove') @patch('apex.undercloud.undercloud.os.path') @patch('apex.undercloud.undercloud.shutil') @patch.object(Undercloud, '_get_vm', return_value=None) @patch.object(Undercloud, 'create') def test_setup_vols(self, mock_get_vm, mock_create, - mock_shutil, mock_os_path, mock_os_remove): + mock_shutil, mock_os_path, mock_os_remove, + mock_uc_builder, mock_virt_utils): uc = Undercloud('img_path', 'tplt_path', external_network=True) mock_os_path.isfile.return_value = True mock_os_path.exists.return_value = True @@ -255,6 +259,9 @@ class TestUndercloud(unittest.TestCase): src_img = os.path.join(uc.image_path, img_file) dest_img = os.path.join(constants.LIBVIRT_VOLUME_PATH, img_file) mock_shutil.copyfile.assert_called_with(src_img, dest_img) + if platform.machine() != 'aarch64': + mock_uc_builder.expand_disk.assert_called() + mock_virt_utils.virt_customize.assert_called() @patch('apex.undercloud.undercloud.os.path') @patch.object(Undercloud, '_get_vm', return_value=None) @@ -278,12 +285,19 @@ class TestUndercloud(unittest.TestCase): {'--run-command': 'chmod 600 /root/.ssh/authorized_keys'}, {'--run-command': 'restorecon ' '-R -v /root/.ssh'}, + {'--run-command': 'id -u stack || useradd -m stack'}, + {'--run-command': 'mkdir -p /home/stack/.ssh'}, + {'--run-command': 'chown stack:stack /home/stack/.ssh'}, {'--run-command': 'cp /root/.ssh/authorized_keys /home/stack/.ssh/'}, {'--run-command': 'chown stack:stack /home/stack/.ssh/authorized_keys'}, {'--run-command': - 'chmod 600 /home/stack/.ssh/authorized_keys'}] + 'chmod 600 /home/stack/.ssh/authorized_keys'}, + {'--run-command': + 'echo "stack ALL = (ALL) NOPASSWD: ALL" >> ' + '/etc/sudoers'}, + {'--run-command': 'touch /etc/cloud/cloud-init.disabled'}] mock_vutils.virt_customize.assert_called_with(test_ops, uc.volume) @patch.object(Undercloud, '_get_vm', return_value=None) diff --git a/apex/undercloud/undercloud.py b/apex/undercloud/undercloud.py index 8b6b9d4c..feae43c3 100644 --- a/apex/undercloud/undercloud.py +++ b/apex/undercloud/undercloud.py @@ -15,6 +15,7 @@ import shutil import subprocess import time +from apex.builders import undercloud_builder as uc_builder from apex.virtual import utils as virt_utils from apex.virtual import configure_vm as vm_lib from apex.common import constants @@ -72,7 +73,8 @@ class Undercloud: kernel_args=['console={}'.format(console), 'root=/dev/{}'.format(root)], default_network=True, - template_dir=self.template_path) + template_dir=self.template_path, + memory=10240) self.setup_volumes() self.inject_auth() @@ -180,11 +182,19 @@ class Undercloud: if os.path.exists(dest_img): os.remove(dest_img) shutil.copyfile(src_img, dest_img) + if img_file == self.image_name and platform.machine() != 'aarch64': + uc_builder.expand_disk(dest_img) + self.expand_root_fs() + shutil.chown(dest_img, user='qemu', group='qemu') os.chmod(dest_img, 0o0744) - # TODO(trozet):check if resize needed right now size is 50gb + + def expand_root_fs(self): # there is a lib called vminspect which has some dependencies and is # not yet available in pip. Consider switching to this lib later. + logging.debug("Expanding root filesystem on /dev/sda partition") + virt_ops = [{constants.VIRT_RUN_CMD: 'xfs_growfs /dev/sda'}] + virt_utils.virt_customize(virt_ops, self.volume) def inject_auth(self): virt_ops = list() @@ -200,9 +210,14 @@ class Undercloud: run_cmds = [ 'chmod 600 /root/.ssh/authorized_keys', 'restorecon -R -v /root/.ssh', + 'id -u stack || useradd -m stack', + 'mkdir -p /home/stack/.ssh', + 'chown stack:stack /home/stack/.ssh', 'cp /root/.ssh/authorized_keys /home/stack/.ssh/', 'chown stack:stack /home/stack/.ssh/authorized_keys', - 'chmod 600 /home/stack/.ssh/authorized_keys' + 'chmod 600 /home/stack/.ssh/authorized_keys', + 'echo "stack ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers', + 'touch /etc/cloud/cloud-init.disabled' ] for cmd in run_cmds: virt_ops.append({constants.VIRT_RUN_CMD: cmd}) diff --git a/build/containers-prepare-parameter.yaml b/build/containers-prepare-parameter.yaml index d6cfd10a..5089c335 100644 --- a/build/containers-prepare-parameter.yaml +++ b/build/containers-prepare-parameter.yaml @@ -10,7 +10,7 @@ parameter_defaults: name_suffix: '' namespace: docker.io/tripleomaster neutron_driver: null - tag: current-tripleo-rdo + tag: current-tripleo excludes: - sensu - manila diff --git a/docs/index.rst b/docs/index.rst index 01f8c19f..2fd1b4ab 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -14,8 +14,7 @@ OPNFV Apex :maxdepth: 3 release/scenarios/os-nosdn-nofeature-noha/index - release/scenarios/os-nosdn-performance-ha/index - release/scenarios/os-ovn-nofeature-noha/index + release/scenarios/os-ovn-nofeature-ha/index release/scenarios/os-nosdn-nofeature-ha/index release/scenarios/os-odl-nofeature-noha/index release/scenarios/os-odl-nofeature-ha/index diff --git a/docs/release/installation/abstract.rst b/docs/release/installation/abstract.rst index aeef1246..2d55c154 100644 --- a/docs/release/installation/abstract.rst +++ b/docs/release/installation/abstract.rst @@ -1,16 +1,16 @@ Abstract ======== -This document describes how to install the Fraser release of OPNFV when +This document describes how to install the Gambia release of OPNFV when using Apex as a deployment tool covering it's limitations, dependencies and required system resources. License ======= -Fraser release of OPNFV when using Apex as a deployment tool Docs +Gambia release of OPNFV when using Apex as a deployment tool Docs (c) by Tim Rozet (Red Hat) -Fraser release of OPNFV when using Apex as a deployment tool Docs +Gambia release of OPNFV when using Apex as a deployment tool Docs are licensed under a Creative Commons Attribution 4.0 International License. You should have received a copy of the license along with this. If not, see <http://creativecommons.org/licenses/by/4.0/>. diff --git a/docs/release/installation/architecture.rst b/docs/release/installation/architecture.rst index 1ab7c7fc..0bf2d3bc 100644 --- a/docs/release/installation/architecture.rst +++ b/docs/release/installation/architecture.rst @@ -16,8 +16,7 @@ deploy the overcloud. The undercloud is the all-in-one installation of OpenStack that includes baremetal provisioning capability. The undercloud will be deployed as a -virtual machine on a Jump Host. This VM is pre-built and distributed as part -of the Apex RPM. +virtual machine on a Jump Host. The overcloud is OPNFV. Configuration will be passed into undercloud and the undercloud will use OpenStack's orchestration component, named Heat, to @@ -127,11 +126,11 @@ issues per scenario. The following scenarios correspond to a supported +-------------------------+-------------+---------------+ | os-nosdn-nofeature-noha | Apex | Yes | +-------------------------+-------------+---------------+ -| os-nosdn-bar-ha | Barometer | Yes | +| os-nosdn-bar-ha | Barometer | No | +-------------------------+-------------+---------------+ -| os-nosdn-bar-noha | Barometer | Yes | +| os-nosdn-bar-noha | Barometer | No | +-------------------------+-------------+---------------+ -| os-nosdn-calipso-noha | Calipso | No | +| os-nosdn-calipso-noha | Calipso | Yes | +-------------------------+-------------+---------------+ | os-nosdn-ovs_dpdk-ha | Apex | No | +-------------------------+-------------+---------------+ @@ -168,9 +167,9 @@ issues per scenario. The following scenarios correspond to a supported +-------------------------+-------------+---------------+ | os-odl-l2gw-noha | Apex | No | +-------------------------+-------------+---------------+ -| os-odl-sfc-ha | SFC | No | +| os-odl-sfc-ha | SFC | Yes | +-------------------------+-------------+---------------+ -| os-odl-sfc-noha | SFC | No | +| os-odl-sfc-noha | SFC | Yes | +-------------------------+-------------+---------------+ | os-odl-gluon-noha | Gluon | No | +-------------------------+-------------+---------------+ @@ -188,5 +187,7 @@ issues per scenario. The following scenarios correspond to a supported +-------------------------+-------------+---------------+ | os-onos-sfc-ha | ONOSFW | No | +-------------------------+-------------+---------------+ -| os-ovn-nofeature-noha | Apex | Yes | +| os-ovn-nofeature-noha | Apex | No | ++-------------------------+-------------+---------------+ +| os-ovn-nofeature-ha | Apex | Yes | +-------------------------+-------------+---------------+ diff --git a/docs/release/installation/baremetal.rst b/docs/release/installation/baremetal.rst index ff55bc16..2a2eefd4 100644 --- a/docs/release/installation/baremetal.rst +++ b/docs/release/installation/baremetal.rst @@ -46,11 +46,17 @@ and report the properties of it back to the undercloud node. After introspection the undercloud will execute a Heat Stack Deployment to continue node provisioning and configuration. The nodes will reboot and PXE from the undercloud PXE server again to provision each node using Glance disk -images provided by the undercloud. These disk images include all the necessary -packages and configuration for an OPNFV deployment to execute. Once the disk +images provided by the undercloud. These disk images include all the necessary +packages and configuration for an OPNFV deployment to execute. Once the disk images have been written to node's disks the nodes will boot locally and -execute cloud-init which will execute the final node configuration. This -configuration is largely completed by executing a puppet apply on each node. +execute cloud-init which will execute the final node configuration. At this +point in the deployment, the Heat Stack will complete, and Mistral will +takeover the configuration of the nodes. Mistral handles calling Ansible which +will connect to each node, and begin configuration. This configuration includes +launching the desired OPNFV services as containers, and generating their +configuration files. These configuration is largely completed by executing a +puppet apply on each container to generate the config files, which are then +stored on the overcloud host and mounted into the service container at runtime. Installation Guide - Bare Metal Deployment ========================================== @@ -62,11 +68,7 @@ Install Bare Metal Jump Host ---------------------------- 1a. If your Jump Host does not have CentOS 7 already on it, or you would like - to do a fresh install, then download the Apex bootable ISO from the OPNFV - artifacts site <http://artifacts.opnfv.org/apex.html>. There have been - isolated reports of problems with the ISO having trouble completing - installation successfully. In the unexpected event the ISO does not work - please workaround this by downloading the CentOS 7 DVD and performing a + to do a fresh install, then download the CentOS 7 DVD and perform a "Virtualization Host" install. If you perform a "Minimal Install" or install type other than "Virtualization Host" simply run ``sudo yum -y groupinstall "Virtualization Host"`` @@ -84,11 +86,11 @@ Install Bare Metal Jump Host Replace /dev/sdX with the device assigned to your usb drive. Then select the USB device as the boot media on your Jump Host -2a. When not using the OPNFV Apex ISO, install these repos: +2a. Install these repos: - ``sudo yum install https://repos.fedorapeople.org/repos/openstack/openstack-pike/rdo-release-pike-1.noarch.rpm`` + ``sudo yum install https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm`` ``sudo yum install epel-release`` - ``sudo curl -o /etc/yum.repos.d/opnfv-apex.repo http://artifacts.opnfv.org/apex/fraser/opnfv-apex.repo`` + ``sudo curl -o /etc/yum.repos.d/opnfv-apex.repo http://artifacts.opnfv.org/apex/queens/opnfv-apex.repo`` The RDO Project release repository is needed to install OpenVSwitch, which is a dependency of opnfv-apex. If you do not have external connectivity to @@ -97,14 +99,12 @@ Install Bare Metal Jump Host opnfv-apex repo hosts all of the Apex dependencies which will automatically be installed when installing RPMs, but will be pre-installed with the ISO. -2b. If you chose not to use the Apex ISO, then you must download and install - the Apex RPMs to the Jump Host. Download the first 3 Apex RPMs from the - OPNFV downloads page, under the TripleO RPMs - ``https://www.opnfv.org/software/downloads``. +2b. Download the first Apex RPMs from the OPNFV downloads page, under the + TripleO RPMs ``https://www.opnfv.org/software/downloads``. The dependent + RPMs will be automatically installed from the opnfv-apex repo in the + previous step. The following RPMs are available for installation: - - opnfv-apex - OpenDaylight, OVN, and nosdn support - - opnfv-apex-undercloud - (reqed) Undercloud Image - python34-opnfv-apex - (reqed) OPNFV Apex Python package - python34-markupsafe - (reqed) Dependency of python34-opnfv-apex ** - python34-jinja2 - (reqed) Dependency of python34-opnfv-apex ** @@ -123,9 +123,9 @@ Install Bare Metal Jump Host automatically installed by installing python34-opnfv-apex when the opnfv-apex.repo has been previously downloaded to ``/etc/yum.repos.d/``. - Install the three required RPMs (replace <rpm> with the actual downloaded + Install the required RPM (replace <rpm> with the actual downloaded artifact): - ``yum -y install <opnfv-apex.rpm> <opnfv-apex-undercloud> <python34-opnfv-apex>`` + ``yum -y install <python34-opnfv-apex>`` 3. After the operating system and the opnfv-apex RPMs are installed, login to your Jump Host as root. @@ -151,7 +151,7 @@ IPMI configuration information gathered in section 2. The nodes dictionary contains a definition block for each baremetal host that will be deployed. 0 or more compute nodes and 1 or 3 controller nodes - are required. (The example file contains blocks for each of these already). + are required (the example file contains blocks for each of these already). It is optional at this point to add more compute nodes into the node list. By specifying 0 compute nodes in the inventory file, the deployment will automatically deploy "all-in-one" nodes which means the compute will run diff --git a/docs/release/installation/index.rst b/docs/release/installation/index.rst index 82b9d25c..ebb311ff 100644 --- a/docs/release/installation/index.rst +++ b/docs/release/installation/index.rst @@ -23,7 +23,7 @@ Contents: :Authors: Tim Rozet (trozet@redhat.com) :Authors: Dan Radez (dradez@redhat.com) -:Version: 6.0 +:Version: 7.0 Indices and tables ================== diff --git a/docs/release/installation/introduction.rst b/docs/release/installation/introduction.rst index 76ed0acb..706e2265 100644 --- a/docs/release/installation/introduction.rst +++ b/docs/release/installation/introduction.rst @@ -1,7 +1,7 @@ Introduction ============ -This document describes the steps to install an OPNFV Fraser reference +This document describes the steps to install an OPNFV Gambia reference platform using the Apex installer. The audience is assumed to have a good background in networking @@ -18,22 +18,14 @@ deployment tool chain. The Apex deployment artifacts contain the necessary tools to deploy and configure an OPNFV target system using the Apex deployment toolchain. -These artifacts offer the choice of using the Apex bootable ISO -(``opnfv-apex-fraser.iso``) to both install CentOS 7 and the -necessary materials to deploy or the Apex RPMs (``opnfv-apex*.rpm``), -and their associated dependencies, which expects installation to a -CentOS 7 libvirt enabled host. The RPM contains a collection of -configuration files, prebuilt disk images, and the automatic deployment -script (``opnfv-deploy``). +The Apex artifact is a python package capable of automating the installation of +TripleO and other OPNFV components. -An OPNFV install requires a "Jump Host" in order to operate. The bootable -ISO will allow you to install a customized CentOS 7 release to the Jump Host, +An OPNFV install requires a "Jump Host" in order to operate. It is required +to install CentOS 7 release to the Jump Host for traditional deployment, which includes the required packages needed to run ``opnfv-deploy``. If you already have a Jump Host with CentOS 7 installed, you may choose to -skip the ISO step and simply install the (``opnfv-apex*.rpm``) RPMs. The RPMs -are the same RPMs included in the ISO and include all the necessary disk -images and configuration files to execute an OPNFV deployment. Either method -will prepare a host to the same ready state for OPNFV deployment. +skip the ISO step and simply install the (``python34-opnfv-apex*.rpm``) RPM. ``opnfv-deploy`` instantiates a Triple-O Undercloud VM server using libvirt as its provider. This VM is then configured and used to provision the diff --git a/docs/release/installation/references.rst b/docs/release/installation/references.rst index 935be038..b8b177d6 100644 --- a/docs/release/installation/references.rst +++ b/docs/release/installation/references.rst @@ -21,7 +21,7 @@ OPNFV OpenStack --------- -`OpenStack Pike Release artifacts <http://www.openstack.org/software/pike>`_ +`OpenStack Queens Release artifacts <http://www.openstack.org/software/queens>`_ `OpenStack documentation <http://docs.openstack.org>`_ diff --git a/docs/release/installation/requirements.rst b/docs/release/installation/requirements.rst index 9aefa21d..239db197 100644 --- a/docs/release/installation/requirements.rst +++ b/docs/release/installation/requirements.rst @@ -6,7 +6,7 @@ Jump Host Requirements The Jump Host requirements are outlined below: -1. CentOS 7 (from ISO or self-installed). +1. CentOS 7 (self-installed) or Fedora (with Snapshot deployment). 2. Root access. @@ -15,7 +15,7 @@ The Jump Host requirements are outlined below: 4. minimum 1 networks and maximum 5 networks, multiple NIC and/or VLAN combinations are supported. This is virtualized for a VM deployment. -5. The Fraser Apex RPMs and their dependencies. +5. The Gambia Apex RPM and its dependencies. 6. 16 GB of RAM for a bare metal deployment, 64 GB of RAM for a Virtual Deployment. diff --git a/docs/release/installation/upstream.rst b/docs/release/installation/upstream.rst index b98b0c19..f18c4b11 100644 --- a/docs/release/installation/upstream.rst +++ b/docs/release/installation/upstream.rst @@ -1,14 +1,11 @@ -Deploying Directly from Upstream - (Beta) -========================================= +Deploying Directly from Upstream +================================ -In addition to deploying with OPNFV tested artifacts included in the -opnfv-apex-undercloud and opnfv-apex RPMs, it is now possible to deploy +When installing the Undercloud and Overcloud, the disk images are now downloaded directly from upstream artifacts. Essentially this deployment pulls the latest RDO overcloud and undercloud artifacts at deploy time. This option is useful -for being able to deploy newer versions of OpenStack that are not included -with this release, and offers some significant advantages for some users. -Please note this feature is currently in beta for the Fraser release and will -be fully supported in the next OPNFV release. +for being able to pull the latest Queens and other OPNFV components which have +been promoted via a TripleO pipeline and deemed to be stable. Upstream Deployment Key Features -------------------------------- @@ -39,19 +36,15 @@ in order to download and prepare the cached artifacts. Scenarios and Deploy Settings for Upstream Deployments ------------------------------------------------------ -Some deploy settings files are already provided which have been tested by the -Apex team. These include (under /etc/opnfv-apex/): - - - os-nosdn-queens_upstream-noha.yaml - - os-nosdn-master_upstream-noha.yaml - - os-odl-queens_upstream-noha.yaml - - os-odl-master_upstream-noha.yaml - -Each of these scenarios has been tested by Apex over the Fraser release, but -none are guaranteed to work as upstream is a moving target and this feature is -relatively new. Still it is the goal of the Apex team to provide support -and move to an upstream based deployments in the future, so please file a bug -when encountering any issues. +The deploy settings and scenarios included with the Gambia release of Apex will +be supported as deemed by the `OPNFV Scenarios in Apex`_ section of this guide. +Each of these scenarios has been tested by Apex over the Gambia release, and +using those deploy settings will control which upstream artifacts are pulled +at deploy time. By specifying different versions of OpenStack, ODL, or other +components in the deploy settings, different upstream artifacts may be downloaded +and are not considered to be supported. For deploying newer versions of components +it is advised to use the master branch of OPNFV Apex as part of our continuous +integration effort to support those components. Including Upstream Patches with Deployment ------------------------------------------------------ @@ -83,8 +76,7 @@ Running ``opnfv-deploy`` Deploying is similar to the typical method used for baremetal and virtual deployments with the addition of a few new arguments to the ``opnfv-deploy`` -command. In order to use an upstream deployment, please use the ``--upstream`` -argument. Also, the artifacts for each upstream deployment are only +command. The artifacts for each upstream deployment are only downloaded when a newer version is detected upstream. In order to explicitly disable downloading new artifacts from upstream if previous artifacts are already cached, please use the ``--no-fetch`` argument. @@ -105,3 +97,5 @@ container with a bash shell. Note the containers do not use systemd, unlike the traditional deployment model and are instead started as the first process in the container. To restart a service, use the ``docker restart <container>`` command. + +.. _`OPNFV Scenarios in Apex`: architecture.html#opnfv-scenarios-in-apex diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst index 8a8593a0..d1e0f102 100644 --- a/docs/release/release-notes/release-notes.rst +++ b/docs/release/release-notes/release-notes.rst @@ -1,11 +1,11 @@ ======================================================================== -OPNFV Release Notes for the Fraser release of OPNFV Apex deployment tool +OPNFV Release Notes for the Gambia release of OPNFV Apex deployment tool ======================================================================== Abstract ======== -This document provides the release notes for Fraser release with the Apex +This document provides the release notes for Gambia release with the Apex deployment toolchain. License @@ -17,7 +17,7 @@ All Apex and "common" entities are protected by the Apache 2.0 License Important Notes =============== -This is the OPNFV Fraser release that implements the deploy stage of the +This is the OPNFV Gambia release that implements the deploy stage of the OPNFV CI pipeline via Apex. Apex is based on RDO's Triple-O installation tool chain. @@ -29,14 +29,14 @@ deploy OPNFV using Apex installer. Summary ======= -Fraser release with the Apex deployment toolchain will establish an OPNFV +Gambia release with the Apex deployment toolchain will establish an OPNFV target system on a Pharos compliant lab infrastructure. The current definition of an OPNFV target system is OpenStack Pike combined with an SDN controller, such as OpenDaylight. The system is deployed with OpenStack High Availability (HA) for most OpenStack services. SDN controllers are deployed on every controller unless deploying with one the HA FD.IO scenarios. Ceph storage is used as Cinder backend, and is the only supported storage for -Fraser. Ceph is setup as 3 OSDs and 3 Monitors, one OSD+Mon per Controller +Gambia. Ceph is setup as 3 OSDs and 3 Monitors, one OSD+Mon per Controller node in an HA setup. Apex also supports non-HA deployments, which deploys a single controller and n number of compute nodes. Furthermore, Apex is capable of deploying scenarios in a bare metal or virtual fashion. Virtual @@ -46,7 +46,7 @@ simulate the a bare metal deployment. - Documentation is built by Jenkins - .iso image is built by Jenkins - .rpm packages are built by Jenkins -- Jenkins deploys a Fraser release with the Apex deployment toolchain +- Jenkins deploys a Gambia release with the Apex deployment toolchain bare metal, which includes 3 control+network nodes, and 2 compute nodes. Release Data @@ -56,16 +56,16 @@ Release Data | **Project** | apex | | | | +--------------------------------------+--------------------------------------+ -| **Repo/tag** | opnfv-6.0.0 | +| **Repo/tag** | opnfv-7.0.0 | | | | +--------------------------------------+--------------------------------------+ -| **Release designation** | 6.0.0 | +| **Release designation** | 7.0.0 | | | | +--------------------------------------+--------------------------------------+ -| **Release date** | 2018-04-30 | +| **Release date** | 2018-11-09 | | | | +--------------------------------------+--------------------------------------+ -| **Purpose of the delivery** | OPNFV Fraser release | +| **Purpose of the delivery** | OPNFV Gambia release | | | | +--------------------------------------+--------------------------------------+ @@ -74,25 +74,25 @@ Version change Module version changes ~~~~~~~~~~~~~~~~~~~~~~ -This is the first tracked version of the Fraser release with the Apex -deployment toolchain. It is based on following upstream versions: +This is the first tracked version of the Gambia release with the Apex +deployment toolchain. It is based on following upstream versions: -- OpenStack (Pike release) +- OpenStack (Queens release) -- OpenDaylight (Nitrogen/Oxygen releases) +- OpenDaylight (Oxygen releases) - CentOS 7 Document Version Changes ~~~~~~~~~~~~~~~~~~~~~~~~ -This is the first tracked version of Fraser release with the Apex +This is the first tracked version of Gambia release with the Apex deployment toolchain. The following documentation is provided with this release: -- OPNFV Installation instructions for the Fraser release with the Apex +- OPNFV Installation instructions for the Gambia release with the Apex deployment toolchain - ver. 1.0.0 -- OPNFV Release Notes for the Fraser release with the Apex deployment +- OPNFV Release Notes for the Gambia release with the Apex deployment toolchain - ver. 1.0.0 (this document) Deliverables @@ -108,10 +108,10 @@ Software Deliverables Documentation Deliverables ~~~~~~~~~~~~~~~~~~~~~~~~~~ -- OPNFV Installation instructions for the Fraser release with the Apex - deployment toolchain - ver. 6.0 -- OPNFV Release Notes for the Fraser release with the Apex deployment - toolchain - ver. 6.0 (this document) +- OPNFV Installation instructions for the Gambia release with the Apex + deployment toolchain - ver. 7.0 +- OPNFV Release Notes for the Gambia release with the Apex deployment + toolchain - ver. 7.0 (this document) Known Limitations, Issues and Workarounds ========================================= @@ -158,9 +158,6 @@ Known Issues +--------------------------------------+--------------------------------------+ | JIRA: APEX-412 | Install failures with UEFI | +--------------------------------------+--------------------------------------+ -| JIRA: APEX-425 | Need to tweak performance settings | -| | virtual DPDK scenarios | -+--------------------------------------+--------------------------------------+ Workarounds @@ -178,10 +175,10 @@ Apex installer. References ========== -For more information on the OPNFV Fraser release, please see: +For more information on the OPNFV Gambia release, please see: -http://wiki.opnfv.org/releases/Fraser +http://wiki.opnfv.org/releases/Gambia :Authors: Tim Rozet (trozet@redhat.com) :Authors: Dan Radez (dradez@redhat.com) -:Version: 6.0 +:Version: 7.0 diff --git a/docs/release/scenarios/k8s-nosdn-nofeature-noha/k8s-nosdn-nofeature-noha.rst b/docs/release/scenarios/k8s-nosdn-nofeature-noha/k8s-nosdn-nofeature-noha.rst index 69b9c2a6..8a70c0ea 100644 --- a/docs/release/scenarios/k8s-nosdn-nofeature-noha/k8s-nosdn-nofeature-noha.rst +++ b/docs/release/scenarios/k8s-nosdn-nofeature-noha/k8s-nosdn-nofeature-noha.rst @@ -4,7 +4,9 @@ This document provides scenario level details for Gambia 1.0 of Kubernetes deployment with no SDN controller, no extra features -and no High Availability enabled. +and no High Availability enabled. Note this scenario is *not* supported +for Gambia initial release and will be supported in a later service release +of Gambia. ============ Introduction diff --git a/docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst b/docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst index bc6d39b8..7b34d074 100644 --- a/docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst +++ b/docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst @@ -2,14 +2,14 @@ .. http://creativecommons.org/licenses/by/4.0 .. (c) <optionally add copywriters name> -This document provides scenario level details for Fraser 1.0 of +This document provides scenario level details for Gambia 1.0 of deployment with no SDN controller and no extra features enabled. ============ Introduction ============ -This scenario is used primarily to validate and deploy a Pike OpenStack +This scenario is used primarily to validate and deploy a Queens OpenStack deployment without any NFV features or SDN controller enabled. Scenario components and composition @@ -38,6 +38,6 @@ None References ========== -For more information on the OPNFV Fraser release, please visit -http://www.opnfv.org/fraser +For more information on the OPNFV Gambia release, please visit +http://www.opnfv.org/gambia diff --git a/docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst b/docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst index 8edd29bd..1e7c5330 100644 --- a/docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst +++ b/docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst @@ -2,14 +2,14 @@ .. http://creativecommons.org/licenses/by/4.0 .. (c) <optionally add copywriters name> -This document provides scenario level details for Fraser 1.0 of +This document provides scenario level details for Gambia 1.0 of deployment with no SDN controller and no extra features enabled. ============ Introduction ============ -This scenario is used primarily to validate and deploy a Pike OpenStack +This scenario is used primarily to validate and deploy a Queens OpenStack deployment without any NFV features or SDN controller enabled. Scenario components and composition @@ -35,6 +35,6 @@ None References ========== -For more information on the OPNFV Fraser release, please visit -http://www.opnfv.org/fraser +For more information on the OPNFV Gambia release, please visit +http://www.opnfv.org/gambia diff --git a/docs/release/scenarios/os-nosdn-performance-ha/index.rst b/docs/release/scenarios/os-nosdn-performance-ha/index.rst deleted file mode 100644 index e0dbca7f..00000000 --- a/docs/release/scenarios/os-nosdn-performance-ha/index.rst +++ /dev/null @@ -1,15 +0,0 @@ -.. _os-nosdn-performance-ha: - -.. This work is licensed under a Creative Commons Attribution 4.0 International Licence. -.. http://creativecommons.org/licenses/by/4.0 -.. (c) <optionally add copywriters name> - -================================================ -os-nosdn-performance-ha overview and description -================================================ - -.. toctree:: - :numbered: - :maxdepth: 4 - - os-nosdn-performance-ha.rst diff --git a/docs/release/scenarios/os-nosdn-performance-ha/os-nosdn-performance-ha.rst b/docs/release/scenarios/os-nosdn-performance-ha/os-nosdn-performance-ha.rst deleted file mode 100644 index beed894e..00000000 --- a/docs/release/scenarios/os-nosdn-performance-ha/os-nosdn-performance-ha.rst +++ /dev/null @@ -1,54 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. (c) <optionally add copywriters name> - -This document provides scenario level details for Fraser 1.0 of -deployment with no SDN controller and performance options enabled. - -============ -Introduction -============ - -This scenario is used primarily to demonstrate the performance settings and -capabilities in Apex. This scenario will deploy a Pike OpenStack -deployment without any NFV features or SDN controller enabled. - -Scenario components and composition -=================================== - -This scenario is composed of common OpenStack services enabled by default, -including Nova, Neutron, Glance, Cinder, Keystone, Horizon. Optionally and -by default, Tacker and Congress services are also enabled. Ceph is used as -the backend storage to Cinder on all deployed nodes. - -All services are in HA, meaning that there are multiple cloned instances of -each service, and they are balanced by HA Proxy using a Virtual IP Address -per service. - -The main purpose of this scenario is to serve as an example to show how to -set optional performance settings in an Apex deploy settings file. - -Scenario usage overview -======================= - -The performance options listed in os-nosdn-performance-ha.yaml give an example -of the different options a user can set in any deploy settings file. Some -of these performance options are actually required for other scenarios which -rely on DPDK. Options under the nova section like 'libvirtpin' allow a -user to choose which core to pin nova instances to on the overcloud compute -node. Options under 'kernel' allow a user to set kernel specific arguments -at boot, which include options like hugepages, isolcpus, enabling iommu, etc. - - -Limitations, Issues and Workarounds -=================================== - -* `APEX-389 <https://jira.opnfv.org/browse/APEX-389>`_: - Compute kernel parameters are applied to all nodes - -References -========== - -For more information on the OPNFV Fraser release, please visit -http://www.opnfv.org/fraser - diff --git a/docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst b/docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst index 52530cdd..55f0e7aa 100644 --- a/docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst +++ b/docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst @@ -2,14 +2,14 @@ .. http://creativecommons.org/licenses/by/4.0 .. (c) <optionally add copywriters name> -This document provides scenario level details for Fraser 1.0 of +This document provides scenario level details for Gambia 1.0 of deployment with the OpenDaylight SDN controller and no extra features enabled. ============ Introduction ============ -This scenario is used primarily to validate and deploy a Pike OpenStack +This scenario is used primarily to validate and deploy a Queens OpenStack deployment with OpenDaylight, and without any NFV features enabled. Scenario components and composition @@ -38,18 +38,12 @@ settings file. Limitations, Issues and Workarounds =================================== -* `APEX-112 <https://jira.opnfv.org/browse/APEX-112>`_: - ODL routes local subnet traffic to GW -* `APEX-149 <https://jira.opnfv.org/browse/APEX-149>`_: - OpenFlow rules are populated very slowly * `APEX-268 <https://jira.opnfv.org/browse/APEX-268>`_: VMs with multiple floating IPs can only access via first NIC -* `APEX-422 <https://jira.opnfv.org/browse/APEX-422>`_: - First nova instance DHCP request fails References ========== -For more information on the OPNFV Fraser release, please visit -http://www.opnfv.org/fraser +For more information on the OPNFV Gambia release, please visit +http://www.opnfv.org/gambia diff --git a/docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst b/docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst index 932ccc85..f4e7a9a4 100644 --- a/docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst +++ b/docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst @@ -2,14 +2,14 @@ .. http://creativecommons.org/licenses/by/4.0 .. (c) <optionally add copywriters name> -This document provides scenario level details for Fraser 1.0 of +This document provides scenario level details for Gambia 1.0 of deployment with the OpenDaylight SDN controller and no extra features enabled. ============ Introduction ============ -This scenario is used primarily to validate and deploy a Pike OpenStack +This scenario is used primarily to validate and deploy a Queens OpenStack deployment with OpenDaylight, and without any NFV features enabled. Scenario components and composition @@ -32,18 +32,12 @@ settings file. Limitations, Issues and Workarounds =================================== -* `APEX-112 <https://jira.opnfv.org/browse/APEX-112>`_: - ODL routes local subnet traffic to GW -* `APEX-149 <https://jira.opnfv.org/browse/APEX-149>`_: - OpenFlow rules are populated very slowly * `APEX-268 <https://jira.opnfv.org/browse/APEX-268>`_: VMs with multiple floating IPs can only access via first NIC -* `APEX-422 <https://jira.opnfv.org/browse/APEX-422>`_: - First nova instance DHCP request fails References ========== -For more information on the OPNFV Fraser release, please visit -http://www.opnfv.org/fraser +For more information on the OPNFV Gambia release, please visit +http://www.opnfv.org/gambia diff --git a/docs/release/scenarios/os-ovn-nofeature-noha/index.rst b/docs/release/scenarios/os-ovn-nofeature-ha/index.rst index 74545044..b7e62e6c 100644 --- a/docs/release/scenarios/os-ovn-nofeature-noha/index.rst +++ b/docs/release/scenarios/os-ovn-nofeature-ha/index.rst @@ -1,4 +1,4 @@ -.. _os-ovn-nofeature-noha: +.. _os-ovn-nofeature-ha: .. This work is licensed under a Creative Commons Attribution 4.0 International Licence. .. http://creativecommons.org/licenses/by/4.0 @@ -12,4 +12,4 @@ os-ovn-nofeature-noha overview and description :numbered: :maxdepth: 4 - os-ovn-nofeature-noha.rst + os-ovn-nofeature-ha.rst diff --git a/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst b/docs/release/scenarios/os-ovn-nofeature-ha/os-ovn-nofeature-ha.rst index 1b2da194..85b1c2ae 100644 --- a/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst +++ b/docs/release/scenarios/os-ovn-nofeature-ha/os-ovn-nofeature-ha.rst @@ -2,7 +2,7 @@ .. http://creativecommons.org/licenses/by/4.0 .. (c) <optionally add copywriters name> -This document provides scenario level details for Fraser 1.0 of +This document provides scenario level details for Gambia 1.0 of deployment with the OVN SDN controller and no extra features enabled. ============ @@ -23,18 +23,17 @@ the backend storage to Cinder on all deployed nodes. Scenario usage overview ======================= -Simply deploy this scenario by using the os-ovn-nofeature-noha.yaml deploy +Simply deploy this scenario by using the os-ovn-nofeature-ha.yaml deploy settings file. Limitations, Issues and Workarounds =================================== -* `APEX-430 <https://jira.opnfv.org/browse/APEX-430>`_: - OVN HA functionality is not available. +None References ========== -For more information on the OPNFV Fraser release, please visit -http://www.opnfv.org/fraser +For more information on the OPNFV Gambia release, please visit +http://www.opnfv.org/gambia diff --git a/lib/ansible/playbooks/deploy_overcloud.yml b/lib/ansible/playbooks/deploy_overcloud.yml index 39fbf52e..b8fb4938 100644 --- a/lib/ansible/playbooks/deploy_overcloud.yml +++ b/lib/ansible/playbooks/deploy_overcloud.yml @@ -12,6 +12,10 @@ - network-environment.yaml - instackenv.json - overcloud-full.qcow2 + - overcloud-full.vmlinuz + - overcloud-full.initrd + - ironic-python-agent.initramfs + - ironic-python-agent.kernel - deploy_command - virtual-environment.yaml - baremetal-environment.yaml |