Prepare for Sphinx 1.5

The new sphinx version introduces some changes that break build:

* Warns if code cannot be parsed for highlighting. Fix the code so
  that it can be parsed, this includes uncommenting "..." lines.
  Note that not every config file is an ini-file.
  Also, the parser seems to have bugs and cannot parse all files.
  Fix mysql ini file and enable the parameter, see
http://dev.mysql.com/doc/refman/5.7/en/innodb-parameters.html#sysvar_innodb_file_per_table
* :option: works only with declared options, replace useage with
  simple ``.

This change only handles a few files, more to come later.

Change-Id: I7c7335e514581622dd562ee355f62d6ae1beaa18

doc/ha-guide/source/controller-ha-identity.rst

@@ -114,10 +114,10 @@ Configure OpenStack Identity service
 
       [catalog]
       driver = keystone.catalog.backends.sql.Catalog
-      ...
+      # ...
       [identity]
       driver = keystone.identity.backends.sql.Identity
-      ...
+      # ...
 
 #. If the Identity service will be sending ceilometer notifications
    and your message bus is configured for high availability, you will

doc/ha-guide/source/controller-ha-pacemaker.rst

@@ -96,7 +96,7 @@ Set up the cluster with pcs
 
    .. note::
 
-      The :option:`-p` option is used to give the password on command
+      The ``-p`` option is used to give the password on command
       line and makes it easier to script.
 
 #. Create and name the cluster, and then start it:
@@ -142,7 +142,7 @@ the Corosync package. An example Corosync configuration file is shown below:
 
 **Example Corosync configuration file for multicast (``corosync.conf``)**
 
-.. code-block:: ini
+.. code-block:: none
 
    totem {
          version: 2
@@ -279,7 +279,7 @@ Note the following:
      configuration file ``/etc/corosync/uidgid.d/pacemaker``
      to be created with the following content:
 
-     .. code-block:: ini
+     .. code-block:: none
 
         uidgid {
           uid: hacluster
@@ -301,7 +301,7 @@ for unicastis is shown below:
 
 **Corosync configuration file fragment for unicast (``corosync.conf``)**
 
-.. code-block:: ini
+.. code-block:: none
 
    totem {
            #...
@@ -403,7 +403,7 @@ disk-based quorum daemon for CMAN, from advanced cluster configurations.
 
 A sample votequorum service configuration in the :file:`corosync.conf` file is:
 
-.. code-block:: ini
+.. code-block:: none
 
    quorum {
            provider: corosync_votequorum (1)
@@ -479,7 +479,7 @@ a Systemd unit file.
 
 You can now check the ``corosync`` connectivity with one of these tools.
 
-Use the :command:`corosync-cfgtool` utility with the :option:`-s` option
+Use the :command:`corosync-cfgtool` utility with the ``-s`` option
 to get a summary of the health of the communication rings:
 
 .. code-block:: console

doc/ha-guide/source/shared-database-manage.rst

@@ -208,7 +208,7 @@ use the ``clustercheck`` utility to improve health checks.
 #. Create a configuration file for the HAProxy monitor service, at
    ``/etc/xinetd.d/galera-monitor``:
 
-   .. code-block:: ini
+   .. code-block:: none
 
       service galera-monitor
       {

doc/ha-guide/source/shared-messaging.rst

@@ -83,7 +83,7 @@ For SLES 12:
    For SLES 12, the packages are signed by GPG key 893A90DAD85F9316.
    You should verify the fingerprint of the imported GPG key before using it.
 
-   .. code-block:: ini
+   .. code-block:: none
 
       Key ID: 893A90DAD85F9316
       Key Name: Cloud:OpenStack OBS Project <Cloud:OpenStack@build.opensuse.org>

doc/ha-guide/source/storage-ha-block.rst

@@ -67,7 +67,7 @@ You can now add the Pacemaker configuration for Block Storage API resource.
 Connect to the Pacemaker cluster with the :command:`crm configure` command
 and add the following cluster resources:
 
-.. code-block:: ini
+.. code-block:: none
 
    primitive p_cinder-api ocf:openstack:cinder-api \
       params config="/etc/cinder/cinder.conf" \

doc/ha-guide/source/storage-ha-file-systems.rst

@@ -42,7 +42,7 @@ Add Shared File Systems API resource to Pacemaker
 
 #. Add the following cluster resources:
 
-   .. code-block:: ini
+   .. code-block:: none
 
       primitive p_manila-api ocf:openstack:manila-api \
         params config="/etc/manila/manila.conf" \

doc/ha-guide/source/storage-ha-image.rst

@@ -120,9 +120,9 @@ configuration in your :file:`nova.conf` file:
 .. code-block:: ini
 
    [glance]
-   ...
+   # ...
    api_servers = 10.0.0.11
-   ...
+   # ...
 
 
 You must also create the OpenStack Image API endpoint with this IP address.