Merge "Removes mirantis-specific content"

This commit is contained in:
Jenkins 2016-04-07 12:26:42 +00:00 committed by Gerrit Code Review
commit 9f3513ef0c
6 changed files with 8 additions and 14 deletions

View File

@ -246,7 +246,7 @@ Other options
* **USE_MIRROR** - pre-built mirrors from Fuel infrastructure.
The following mirrors can be used:
* ext (external mirror, available from outside of Mirantis network)
* ext (external mirror, publicly available one)
* none (reserved for building local mirrors: in this case
CentOS and Ubuntu packages will be fetched from upstream mirrors, so
that it will make the build process much slower).
@ -262,6 +262,6 @@ Other options
tuple with repo-name and repo-path:
<first_repo_name>,<repo_path> <second_repo_name>,<second_repo_path>
For example,
*qemu2,http://osci-obs.vm.mirantis.net:82/centos-fuel-5.1-stable-15943/centos/ libvirt,http://osci-obs.vm.mirantis.net:82/centos-fuel-5.1-stable-17019/centos/*.
qemu2,http://hostname.domain.tld/some/path/ libvirt,http://hostname.domain.tld/another/path/
Note that if you want to add more packages to the Fuel Master node, you should update the **requirements-rpm.txt** file.

View File

@ -52,8 +52,6 @@ Each tasks reports back if it is successful. Astute stops the deployment on any
.. image:: _images/granularDeployment.png
See also `Fuel Reference Architecture: Task Deployment <https://docs.mirantis.com/openstack/fuel/fuel-6.1/reference-architecture.html#task-deployment>_`.
Task Graph
----------

View File

@ -24,10 +24,7 @@ be used on bonds now. Three modes are supported now: 'active-backup',
Deployment serialization
------------------------
Most detailed docs on deployment serialization for neutron are here:
1. http://docs.mirantis.com/fuel/fuel-4.0/reference-architecture.html#advanced-network-configuration-using-open-vswitch
2. https://etherpad.openstack.org/p/neutron-orchestrator-serialization
For details on deployment serialization for neutron, see: https://etherpad.openstack.org/p/neutron-orchestrator-serialization
Changes related to bonding are in the “transformations” section:

View File

@ -218,7 +218,7 @@ Now we need to write the pxelinux configuration file. It will be located here
MENU LABEL Install ^FUEL
KERNEL /fuel/isolinux/vmlinuz
INITRD /fuel/isolinux/initrd.img
APPEND biosdevname=0 ks=nfs:10.20.0.1:/var/lib/tftpboot/fuel/ks.cfg repo=nfs:10.20.0.1:/var/lib/tftpboot/fuel ip=10.20.0.2 netmask=255.255.255.0 gw=10.20.0.1 dns1=10.20.0.1 hostname=fuel.mirantis.com showmenu=no
APPEND biosdevname=0 ks=nfs:10.20.0.1:/var/lib/tftpboot/fuel/ks.cfg repo=nfs:10.20.0.1:/var/lib/tftpboot/fuel ip=10.20.0.2 netmask=255.255.255.0 gw=10.20.0.1 dns1=10.20.0.1 hostname=fuel.example.com showmenu=no
LABEL reboot
MENU LABEL ^Reboot

View File

@ -91,13 +91,12 @@ implement this feature, these steps were followed:
cd fuel-main
NAILGUN_GERRIT_COMMIT=refs/changes/32/90687/1 make iso
#. Once your ISO build is complete, you can test it. If
#. Once your ISO build is complete, you can test it. If
you have access to hardware that can run the KVM
hypervisor, you can follow the instructions found in the
:doc:`Devops Guide </devdocs/devops>` to create a robust testing
environment. Otherwise you can test the ISO with
Virtualbox (the download link can be found at
`https://software.mirantis.com/ <https://software.mirantis.com/>`_)
environment. Otherwise, you can test the ISO with
Virtualbox (https://github.com/openstack/fuel-virtualbox/).
#. Once your code has been merged, you can return your local
repo to the master branch so you can start fresh on your

View File

@ -202,7 +202,7 @@ a few steps:
#. In all files you need to make changes:
* Change email devops+alert@mirantis.com to your own
* Change email alert@example.com to your own
* If you don't need reporting jobs you should delete triggering of
fuel_community_build_reports in all jobs or disable reporting job