diff options
| -rw-r--r-- | doc/source/deploy/install-guide.rst | 39 | ||||
| -rw-r--r-- | doc/source/dev/dev-quickstart.rst | 24 |
2 files changed, 49 insertions, 14 deletions
diff --git a/doc/source/deploy/install-guide.rst b/doc/source/deploy/install-guide.rst index 836e56ad2..360b8f51f 100644 --- a/doc/source/deploy/install-guide.rst +++ b/doc/source/deploy/install-guide.rst @@ -144,12 +144,18 @@ Install the Bare Metal service Ubuntu 14.04 (trusty) or higher: sudo apt-get install ironic-api ironic-conductor python-ironicclient - RHEL7/CentOS7/Fedora 21 or higher: + Fedora 21/RHEL7/CentOS7: sudo yum install openstack-ironic-api openstack-ironic-conductor \ python-ironicclient sudo systemctl enable openstack-ironic-api openstack-ironic-conductor sudo systemctl start openstack-ironic-api openstack-ironic-conductor + Fedora 22 or higher: + sudo dnf install openstack-ironic-api openstack-ironic-conductor \ + python-ironicclient + sudo systemctl enable openstack-ironic-api openstack-ironic-conductor + sudo systemctl start openstack-ironic-api openstack-ironic-conductor + Configure the Bare Metal service ================================ @@ -302,7 +308,7 @@ Bare Metal service comes with an example file for configuring the 1. Install the apache service:: - RHEL7/CentOS7/Fedora 21 (or lower): + Fedora 21/RHEL7/CentOS7: sudo yum install httpd Fedora 22 (or higher): @@ -762,9 +768,12 @@ node(s) where ``ironic-conductor`` is running. Ubuntu: (14.10 and after) sudo apt-get install tftpd-hpa syslinux-common pxelinux - Fedora/RHEL7/CentOS7: + Fedora 21/RHEL7/CentOS7: sudo yum install tftp-server syslinux-tftpboot + Fedora 22 or higher: + sudo dnf install tftp-server syslinux-tftpboot + #. Setup tftp server to serve ``/tftpboot``. #. Copy the PXE image to ``/tftpboot``. The PXE image might be found at [1]_:: @@ -835,10 +844,12 @@ steps on the ironic conductor node to configure the PXE UEFI environment. Ubuntu: (14.04LTS and later) sudo apt-get install grub-efi-amd64-signed shim-signed - Fedora: (21 and later) - CentOS: (7 and later) + Fedora 21/RHEL7/CentOS7: sudo yum install grub2-efi shim + Fedora 22 or higher: + sudo dnf install grub2-efi shim + #. Copy grub and shim boot loader images to ``/tftpboot`` directory:: Ubuntu: (14.04LTS and later) @@ -963,9 +974,12 @@ on the Bare Metal service node(s) where ``ironic-conductor`` is running. Ubuntu: apt-get install ipxe - Fedora/RHEL7/CentOS7: + Fedora 21/RHEL7/CentOS7: yum install ipxe-bootimgs + Fedora 22 or higher: + dnf install ipxe-bootimgs + #. Copy the iPXE boot image (undionly.kpxe) to ``/tftpboot``. The binary might be found at:: @@ -1110,10 +1124,12 @@ The web console can be configured in Bare Metal service in the following way: Ubuntu: sudo apt-get install shellinabox - Fedora/RHEL7/CentOS7: - + Fedora 21/RHEL7/CentOS7: sudo yum install shellinabox + Fedora 22 or higher: + sudo dnf install shellinabox + You can find more about shellinabox on the `shellinabox page`_. You can optionally use the SSL certificate in shellinabox. If you want to use the SSL @@ -1124,9 +1140,12 @@ The web console can be configured in Bare Metal service in the following way: Ubuntu: sudo apt-get install openssl - Fedora/RHEL7/CentOS7: + Fedora 21/RHEL7/CentOS7: sudo yum install openssl + Fedora 22 or higher: + sudo dnf install openssl + 2. Generate the SSL certificate, here is an example, you can find more about openssl on the `openssl page`_:: @@ -2126,7 +2145,7 @@ CoreOS tools #. Install the requirements:: - Fedora 21 or lower/RHEL7/CentOS7: + Fedora 21/RHEL7/CentOS7: sudo yum install docker gzip util-linux cpio findutils grep gpg Fedora 22 or higher: diff --git a/doc/source/dev/dev-quickstart.rst b/doc/source/dev/dev-quickstart.rst index 5d3c07c6f..a104c95d3 100644 --- a/doc/source/dev/dev-quickstart.rst +++ b/doc/source/dev/dev-quickstart.rst @@ -22,10 +22,14 @@ Install prerequisites (for python 2.7): sudo apt-get install python-dev libssl-dev python-pip libmysqlclient-dev libxml2-dev libxslt-dev libpq-dev git git-review libffi-dev gettext ipmitool psmisc graphviz -- Fedora/RHEL7:: +- Fedora 21/RHEL7/CentOS7:: sudo yum install python-devel openssl-devel python-pip mysql-devel libxml2-devel libxslt-devel postgresql-devel git git-review libffi-devel gettext ipmitool psmisc graphviz gcc +- Fedora 22 or higher:: + + sudo dnf install python-devel openssl-devel python-pip mysql-devel libxml2-devel libxslt-devel postgresql-devel git git-review libffi-devel gettext ipmitool psmisc graphviz gcc + If using RHEL and yum reports "No package python-pip available" and "No package git-review available", use the EPEL software repository. Instructions can be found at `<http://fedoraproject.org/wiki/EPEL/FAQ#howtouse>`_. @@ -43,10 +47,14 @@ Using Python 3.4: Follow the instructions above to install prerequisites and on: - - Fedora:: + - Fedora 21/RHEL7/CentOS7:: sudo yum install python3-devel + - Fedora 22 higher:: + + sudo dnf install python3-devel + Install these on all distros:: sudo easy_install nose @@ -133,10 +141,14 @@ Option 1: Manual Install # Ubuntu/Debian: sudo apt-get install rabbitmq-server - # Fedora/RHEL7: + # Fedora 21/RHEL7/CentOS7: sudo yum install rabbitmq-server sudo systemctl start rabbitmq-server.service + # Fedora 22 or higher: + sudo dnf install rabbitmq-server + sudo systemctl start rabbitmq-server.service + # openSUSE/SLE 12: sudo zypper install rabbitmq-server sudo systemctl start rabbitmq-server.service @@ -146,10 +158,14 @@ Option 1: Manual Install # Ubuntu/Debian: # sudo apt-get install mysql-server - # Fedora/RHEL7: + # Fedora 21/RHEL7/CentOS7: # sudo yum install mariadb # sudo systemctl start mariadb.service + # Fedora 22 or higher: + # sudo dnf install mariadb + # sudo systemctl start mariadb.service + # openSUSE/SLE 12: # sudo zypper install mariadb # sudo systemctl start mysql.service |