Merge "Fixes for openSUSE/SLES"

openstack · Oct 18, 2013 · 59710f4 · 59710f4
2 parents f865c40 + cee5051
commit 59710f4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/doc/install-guide/ch_basics.xml b/doc/install-guide/ch_basics.xml
@@ -273,7 +273,12 @@ hwclock -w</programlisting>
     <note os="ubuntu;debian"><para>When you install the server package, you will
     be asked to enter a root password for the database. Be sure to choose
     a strong password and remember it - it will be needed later.</para></note>
-    <para>Edit <filename>/etc/mysql/my.cnf</filename> and set the <literal>bind-address</literal> to the internal IP address of the controller, to allow access from outside the controller node.</para>
+    <para>Edit <filename
+    os="ubuntu;debian;rhel;fedora;centos">/etc/mysql/my.cnf</filename><filename
+    os="opensuse;sles">/etc/my.cnf</filename> and set the
+    <literal>bind-address</literal> to the internal IP address of the
+    controller, to allow access from outside the controller
+    node.</para>
     <programlisting language="ini">
     # Instead of skip-networking the default is now to listen only on
     # localhost which is more compatible and is not less secure.
@@ -297,8 +302,10 @@ hwclock -w</programlisting>
         <phrase os="opensuse;sles">MariaDB or MySQL</phrase>
         database server and set it to start automatically when
         the system boots.</para>
-    <screen os="rhel;centos;fedora;opensuse;sles"><prompt>#</prompt> <userinput>service mysqld start</userinput>
+    <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>service mysqld start</userinput>
 <prompt>#</prompt> <userinput>chkconfig mysqld on</userinput></screen>
+    <screen os="opensuse;sles"><prompt>#</prompt> <userinput>service mysql start</userinput>
+<prompt>#</prompt> <userinput>chkconfig mysql on</userinput></screen>
 
     <para os="rhel;centos;fedora;opensuse;sles">Finally, you should set a root password for your
         <phrase os="rhel;fedora;centos">MySQL</phrase>
@@ -356,7 +363,7 @@ hwclock -w</programlisting>
 
     <para os="opensuse;sles">Start the messaging service and set it to start automatically when the system boots:</para>
     <screen os="opensuse;sles"><prompt>#</prompt> <userinput>service rabbitmq-server start</userinput>
-<prompt>#</prompt> <userinput>service rabbitmq-server enable</userinput></screen>
+<prompt>#</prompt> <userinput>chkconfig rabbitmq-server on</userinput></screen>
 
   </section>
   <section xml:id="basics-packages">

diff --git a/doc/install-guide/section_ceilometer-install.xml b/doc/install-guide/section_ceilometer-install.xml
@@ -67,6 +67,8 @@ connection = mongodb://ceilometer:<replaceable>CEILOMETER_DBPASS</replaceable>@<
       <screen os="rhel;centos;fedora;opensuse;sles"><prompt>#</prompt> <userinput>ADMIN_TOKEN=$(openssl rand -hex 10)</userinput>
 <prompt>#</prompt> <userinput>echo $ADMIN_TOKEN</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/keystone/keystone.conf publisher_rpc metering_secret $ADMIN_TOKEN</userinput></screen>
+      <para os="sles;opensuse">For SUSE Linux Enterprise use instead as first command:</para>
+      <screen os="opensuse;sles"><prompt>#</prompt> <userinput>ADMIN_TOKEN=$(openssl rand 10|hexdump  -e '1/1 "%.2x"')</userinput></screen>
       <screen os="ubuntu"><prompt>#</prompt> <userinput>openssl rand -hex 10</userinput></screen>
 <para os="ubuntu">Edit <filename>/etc/ceilometer/ceilometer.conf</filename> and
        change the <literal>[DEFAULT]</literal> section, replacing ADMIN_TOKEN with the results of the command.</para>

diff --git a/doc/install-guide/section_keystone-install.xml b/doc/install-guide/section_keystone-install.xml
@@ -65,6 +65,8 @@ IDENTIFIED BY '<replaceable>KEYSTONE_DBPASS</replaceable>';</userinput></screen>
 <prompt>#</prompt> <userinput>echo $ADMIN_TOKEN</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/keystone/keystone.conf DEFAULT admin_token $ADMIN_TOKEN</userinput></screen>
       <screen os="ubuntu"><prompt>#</prompt> <userinput>openssl rand -hex 10</userinput></screen>
+      <para os="sles;opensuse">For SUSE Linux Enterprise use instead as first command:</para>
+      <screen os="opensuse;sles"><prompt>#</prompt> <userinput>ADMIN_TOKEN=$(openssl rand 10|hexdump  -e '1/1 "%.2x"')</userinput></screen>
 <para os="ubuntu">Edit <filename>/etc/keystone/keystone.conf</filename> and
        change the <literal>[DEFAULT]</literal> section, replacing ADMIN_TOKEN with the results of the command.</para>
       <programlisting os="ubuntu" language="ini">