openstack/openstack-manuals
Code Issues Proposed changes

Install Guide: Basic Chapter fixes openSUSE/SLES

Browse Source 
Since SLES 12 and openSUSE 13.2 both use systemd, we can remove special
handling for them and also merge instructions with the Fedora based
distros.

Update specifice instructions in Basic chapter.

Change-Id: I16bc5695e60dd00e54c4eb63caf4ccf08bc36842
This commit is contained in:
Andreas Jaeger 2015-04-11 13:27:37 +02:00
parent aa91021764
commit 626b92bea2
4 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/install-guide/section_basics-database.xml
View File

@ -22,10 +22,7 @@
<screen os="ubuntu"><prompt>#</prompt> <userinput>apt-get install mariadb-server python-mysqldb</userinput></screen>
<screen os="debian"><prompt>#</prompt> <userinput>apt-get install mysql-server python-mysqldb</userinput></screen>
<screen os="rhel;fedora;centos"><prompt>#</prompt> <userinput>yum install mariadb mariadb-server MySQL-python</userinput></screen>
<para os="sles;opensuse">On openSUSE:</para>
<screen os="opensuse"><prompt>#</prompt> <userinput>zypper install mariadb-client mariadb python-mysql</userinput></screen>
<para os="sles;opensuse">On SLES:</para>
<screen os="sles"><prompt>#</prompt> <userinput>zypper install mysql-client mysql python-mysql</userinput></screen>
<screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install mariadb-client mariadb python-mysql</userinput></screen>
</step>
<step os="ubuntu;debian">
<para>Choose a suitable password for the database root account.</para>
@ -34,7 +31,10 @@
<para os="ubuntu;debian">Create and edit the
<filename>/etc/mysql/conf.d/mysqld_openstack.cnf</filename> file and
complete the following actions:</para>
<para os="rhel;centos;fedora;sles;opensuse">Edit the
<para os="opensuse;sles">Create and edit the
<filename>/etc/my.cnf.d/mariadb_openstack.cnf</filename> file and
complete the following actions:</para>
<para os="rhel;centos;fedora">Edit the
<filename>/etc/my.cnf</filename> file and complete the following
actions:</para>
<substeps>
@ -73,11 +73,7 @@ character-set-server = utf8</programlisting>
system boots:</para>
<screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable mariadb.service</userinput>
<prompt>#</prompt> <userinput>systemctl start mariadb.service</userinput></screen>
<para os="sles;opensuse">On SLES:</para>
<screen os="sles"><prompt>#</prompt> <userinput>service mysql start</userinput>
<prompt>#</prompt> <userinput>chkconfig mysql on</userinput></screen>
<para os="sles;opensuse">On openSUSE:</para>
<screen os="opensuse"><prompt>#</prompt> <userinput>systemctl start mysql.service</userinput>
<screen os="opensuse;sles"><prompt>#</prompt> <userinput>systemctl start mysql.service</userinput>
<prompt>#</prompt> <userinput>systemctl enable mysql.service</userinput></screen>
</step>
<step>

2
doc/install-guide/section_basics-networking.xml
View File

@ -54,7 +54,7 @@
<para>Use the YaST network module:</para>
<screen os="opensuse;sles"><prompt>#</prompt> <userinput>yast2 network</userinput></screen>
<para>For more information, see the
<link xlink:href="https://www.suse.com/documentation/sles11/book_sle_admin/data/sec_nm_activate.html">SLES </link> or
<link xlink:href="https://www.suse.com/documentation/sles-12/book_sle_admin/data/sec_nm_activate.html">SLES </link> or
the
<link xlink:href="http://activedoc.opensuse.org/book/opensuse-reference/chapter-13-basic-networking#sec.basicnet.yast.netcard.global">
openSUSE documentation</link>.

16
doc/install-guide/section_basics-ntp.xml
View File

@ -55,14 +55,8 @@ restrict -6 default kod notrap nomodify</programlisting>
<step os="rhel;centos;fedora;sles;opensuse">
<para>Start the NTP service and configure it to start when the system
boots:</para>
<screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable ntpd.service</userinput>
<screen><prompt>#</prompt> <userinput>systemctl enable ntpd.service</userinput>
<prompt>#</prompt> <userinput>systemctl start ntpd.service</userinput></screen>
<para os="sles">On SLES:</para>
<screen os="sles"><prompt>#</prompt> <userinput>service ntp start</userinput>
<prompt>#</prompt> <userinput>chkconfig ntp on</userinput></screen>
<para os="opensuse">On openSUSE:</para>
<screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable ntp.service</userinput>
<prompt>#</prompt> <userinput>systemctl start ntp.service</userinput></screen>
</step>
</procedure>
</section>
@ -97,14 +91,8 @@ restrict -6 default kod notrap nomodify</programlisting>
<step os="rhel;centos;fedora;sles;opensuse">
<para>Start the NTP service and configure it to start when the system
boots:</para>
<screen os="rhel;fedora;centos"><prompt>#</prompt> <userinput>systemctl enable ntpd.service</userinput>
<screen><prompt>#</prompt> <userinput>systemctl enable ntpd.service</userinput>
<prompt>#</prompt> <userinput>systemctl start ntpd.service</userinput></screen>
<para os="sles">On SLES:</para>
<screen os="sles"><prompt>#</prompt> <userinput>service ntp start</userinput>
<prompt>#</prompt> <userinput>chkconfig ntp on</userinput></screen>
<para os="opensuse">On openSUSE:</para>
<screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable ntp.service</userinput>
<prompt>#</prompt> <userinput>systemctl start ntp.service</userinput></screen>
</step>
</procedure>
</section>

8
doc/install-guide/section_basics-queue.xml
View File

@ -59,13 +59,7 @@
<step os="rhel;centos;fedora;sles;opensuse">
<para>Start the message queue service and configure it to start when the
system boots:</para>
<screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable rabbitmq-server.service</userinput>
<prompt>#</prompt> <userinput>systemctl start rabbitmq-server.service</userinput></screen>
<para os="sles">On SLES:</para>
<screen os="sles"><prompt>#</prompt> <userinput>service rabbitmq-server start</userinput>
<prompt>#</prompt> <userinput>chkconfig rabbitmq-server on</userinput></screen>
<para os="opensuse">On openSUSE:</para>
<screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable rabbitmq-server.service</userinput>
<screen os="rhel;centos;fedora;sles;opensuse"><prompt>#</prompt> <userinput>systemctl enable rabbitmq-server.service</userinput>
<prompt>#</prompt> <userinput>systemctl start rabbitmq-server.service</userinput></screen>
</step>
<step>