openstack
/
sahara-plugin-vanilla
Code Issues Proposed changes

doc: update distro information and cloud-init users 

- centralize the information about the default cloud-init users
  for various distributions to point to the existing specialized
  page;
- remove all CentOS 6 and Ubuntu 12.04 (Precise) references, and
  do not refer to Ubuntu 14.04 for the vanilla plugin;
- add Ubuntu 16.04 (Xenial) details when needed;
- update the pointers to few packages.

Change-Id: I4654e6ec2821bcec5207f41b93c5d0f0633ba18c
This commit is contained in:
Luigi Toscano 2018-09-13 23:05:20 +02:00
parent d5a961ba0d
commit 274af35ddd
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/source/user/vanilla-imagebuilder.rst
View File

@ -21,10 +21,9 @@ Elements for building vanilla images are stored in the
Sahara requires images with cloud-init package installed: Sahara requires images with cloud-init package installed:
* `For Fedora <http://pkgs.fedoraproject.org/cgit/cloud-init.git/>`_ * `For Ubuntu 16.04 <http://packages.ubuntu.com/xenial/cloud-init>`_
* `For Ubuntu 14 <http://packages.ubuntu.com/trusty/cloud-init>`_ * `For CentOS 7 <http://mirror.centos.org/centos/7/os/x86_64/Packages/cloud-init-0.7.9-24.el7.centos.x86_64.rpm>`_
* `For CentOS 6 <http://mirror.centos.org/centos/6/extras/x86_64/Packages/cloud-init-0.7.5-10.el6.centos.2.x86_64.rpm>`_ * `For Fedora <https://src.fedoraproject.org/rpms/cloud-init>`_
* `For CentOS 7 <http://mirror.centos.org/centos/7/extras/x86_64/Packages/cloud-init-0.7.5-10.el7.centos.1.x86_64.rpm>`_
To create vanilla images follow these steps: To create vanilla images follow these steps:

16
doc/source/user/vanilla-plugin.rst
View File

@ -15,20 +15,8 @@ You may build images by yourself using :doc:`vanilla-imagebuilder`.
Vanilla plugin requires an image to be tagged in Sahara Image Registry with Vanilla plugin requires an image to be tagged in Sahara Image Registry with
two tags: 'vanilla' and '<hadoop version>' (e.g. '2.7.1'). two tags: 'vanilla' and '<hadoop version>' (e.g. '2.7.1').
The default username specified for these images is different The image requires a username. For more information, refer to the
for each distribution: :doc:`registering-image` section.
+--------------+------------+
| OS | username |
+==============+============+
| Ubuntu 14 | ubuntu |
+--------------+------------+
| Fedora 20 | fedora |
+--------------+------------+
| CentOS 6 | cloud-user |
+--------------+------------+
| CentOS 7 | centos |
+--------------+------------+
Cluster Validation Cluster Validation
------------------ ------------------