diff --git a/install-guide/source/configure_services/cinder/install-cinder-obs.rst b/install-guide/source/cinder/install-cinder-obs.rst similarity index 100% rename from install-guide/source/configure_services/cinder/install-cinder-obs.rst rename to install-guide/source/cinder/install-cinder-obs.rst diff --git a/install-guide/source/configure_services/cinder/install-cinder-rdo.rst b/install-guide/source/cinder/install-cinder-rdo.rst similarity index 100% rename from install-guide/source/configure_services/cinder/install-cinder-rdo.rst rename to install-guide/source/cinder/install-cinder-rdo.rst diff --git a/install-guide/source/configure_services/cinder/install-cinder-ubuntu.rst b/install-guide/source/cinder/install-cinder-ubuntu.rst similarity index 100% rename from install-guide/source/configure_services/cinder/install-cinder-ubuntu.rst rename to install-guide/source/cinder/install-cinder-ubuntu.rst diff --git a/install-guide/source/configure_services/glance/install-glance-obs.rst b/install-guide/source/glance/install-glance-obs.rst similarity index 100% rename from install-guide/source/configure_services/glance/install-glance-obs.rst rename to install-guide/source/glance/install-glance-obs.rst diff --git a/install-guide/source/configure_services/glance/install-glance-rdo.rst b/install-guide/source/glance/install-glance-rdo.rst similarity index 100% rename from install-guide/source/configure_services/glance/install-glance-rdo.rst rename to install-guide/source/glance/install-glance-rdo.rst diff --git a/install-guide/source/configure_services/glance/install-glance-ubuntu.rst b/install-guide/source/glance/install-glance-ubuntu.rst similarity index 100% rename from install-guide/source/configure_services/glance/install-glance-ubuntu.rst rename to install-guide/source/glance/install-glance-ubuntu.rst diff --git a/install-guide/source/index.rst b/install-guide/source/index.rst index 431e9efb1c..2dee0cb6d8 100644 --- a/install-guide/source/index.rst +++ b/install-guide/source/index.rst @@ -6,21 +6,8 @@ Telemetry Data Collection service :maxdepth: 2 get_started.rst - install-base-obs.rst - install-base-rdo.rst - install-base-ubuntu.rst - configure_services/glance/install-glance-obs.rst - configure_services/glance/install-glance-rdo.rst - configure_services/glance/install-glance-ubuntu.rst - configure_services/nova/install-nova-obs.rst - configure_services/nova/install-nova-rdo.rst - configure_services/nova/install-nova-ubuntu.rst - configure_services/cinder/install-cinder-obs.rst - configure_services/cinder/install-cinder-rdo.rst - configure_services/cinder/install-cinder-ubuntu.rst - configure_services/swift/install-swift-obs.rst - configure_services/swift/install-swift-rdo.rst - configure_services/swift/install-swift-ubuntu.rst + install-compute.rst + install-controller.rst verify.rst next-steps.rst database/environment-nosql-database-obs.rst diff --git a/install-guide/source/install-base-config-common.rst b/install-guide/source/install-base-config-common.inc similarity index 100% rename from install-guide/source/install-base-config-common.rst rename to install-guide/source/install-base-config-common.inc diff --git a/install-guide/source/install-base-obs.rst b/install-guide/source/install-base-obs.rst index 8843a6d27c..5cb05e5a60 100644 --- a/install-guide/source/install-base-obs.rst +++ b/install-guide/source/install-base-obs.rst @@ -6,10 +6,6 @@ Install and configure for openSUSE and SUSE Linux Enterprise This section describes how to install and configure the Telemetry service, code-named ceilometer, on the controller node. -This section assumes that you already have a working OpenStack -environment with at least the following components installed: -Compute, Image Service, Identity. - Prerequisites ------------- @@ -50,7 +46,7 @@ MongoDB before proceeding further. the ``/etc/mongodb.conf`` file, restart the MongoDB service using ``systemctl restart mongodb``, and try calling the command again. -.. include:: install-base-prereq-common.rst +.. include:: install-base-prereq-common.inc Install and configure components -------------------------------- @@ -64,7 +60,7 @@ Install and configure components openstack-ceilometer-agent-notification \ openstack-ceilometer-agent-central python-ceilometerclient -.. include:: install-base-config-common.rst +.. include:: install-base-config-common.inc * In the ``[collector]`` section, configure the dispatcher: diff --git a/install-guide/source/install-base-prereq-common.rst b/install-guide/source/install-base-prereq-common.inc similarity index 100% rename from install-guide/source/install-base-prereq-common.rst rename to install-guide/source/install-base-prereq-common.inc diff --git a/install-guide/source/install-base-rdo.rst b/install-guide/source/install-base-rdo.rst index ca9255d013..f9a9504727 100644 --- a/install-guide/source/install-base-rdo.rst +++ b/install-guide/source/install-base-rdo.rst @@ -6,10 +6,6 @@ Install and configure for Red Hat Enterprise Linux and CentOS This section describes how to install and configure the Telemetry service, code-named ceilometer, on the controller node. -This section assumes that you already have a working OpenStack -environment with at least the following components installed: -Compute, Image Service, Identity. - Prerequisites ------------- @@ -35,7 +31,7 @@ MongoDB before proceeding further. Replace ``CEILOMETER_DBPASS`` with a suitable password. -.. include:: install-base-prereq-common.rst +.. include:: install-base-prereq-common.inc Install and configure components -------------------------------- @@ -48,7 +44,7 @@ Install and configure components openstack-ceilometer-collector openstack-ceilometer-notification \ openstack-ceilometer-central python-ceilometerclient -.. include:: install-base-config-common.rst +.. include:: install-base-config-common.inc Configure the Apache HTTP server -------------------------------- diff --git a/install-guide/source/install-base-ubuntu.rst b/install-guide/source/install-base-ubuntu.rst index 8866c19eaa..36979c6845 100644 --- a/install-guide/source/install-base-ubuntu.rst +++ b/install-guide/source/install-base-ubuntu.rst @@ -6,10 +6,6 @@ Install and configure for Ubuntu This section describes how to install and configure the Telemetry service, code-named ceilometer, on the controller node. -This section assumes that you already have a working OpenStack -environment with at least the following components installed: -Compute, Image Service, Identity. - Prerequisites ------------- @@ -50,7 +46,7 @@ MongoDB before proceeding further. the ``/etc/mongodb.conf`` file, restart the MongoDB service using ``service mongodb restart``, and try calling the command again. -.. include:: install-base-prereq-common.rst +.. include:: install-base-prereq-common.inc Install and configure components -------------------------------- @@ -63,7 +59,7 @@ Install and configure components ceilometer-agent-central ceilometer-agent-notification \ python-ceilometerclient -.. include:: install-base-config-common.rst +.. include:: install-base-config-common.inc Configure the Apache HTTP server -------------------------------- diff --git a/install-guide/source/configure_services/nova/install-nova-common.rst b/install-guide/source/install-compute-common.inc similarity index 100% rename from install-guide/source/configure_services/nova/install-nova-common.rst rename to install-guide/source/install-compute-common.inc diff --git a/install-guide/source/configure_services/nova/install-nova-obs.rst b/install-guide/source/install-compute-obs.rst similarity index 95% rename from install-guide/source/configure_services/nova/install-nova-obs.rst rename to install-guide/source/install-compute-obs.rst index 82b6edf886..726dcb84a4 100644 --- a/install-guide/source/configure_services/nova/install-nova-obs.rst +++ b/install-guide/source/install-compute-obs.rst @@ -13,7 +13,7 @@ Install and configure components # zypper install openstack-ceilometer-agent-compute -.. include:: install-nova-common.rst +.. include:: install-compute-common.inc Finalize installation --------------------- diff --git a/install-guide/source/configure_services/nova/install-nova-rdo.rst b/install-guide/source/install-compute-rdo.rst similarity index 86% rename from install-guide/source/configure_services/nova/install-nova-rdo.rst rename to install-guide/source/install-compute-rdo.rst index 49884a0009..c2f9d86c34 100644 --- a/install-guide/source/configure_services/nova/install-nova-rdo.rst +++ b/install-guide/source/install-compute-rdo.rst @@ -11,9 +11,9 @@ Install and configure components .. code-block:: console - # yum install openstack-ceilometer-compute python-ceilometerclient python-pecan + # yum install openstack-ceilometer-compute -.. include:: install-nova-common.rst +.. include:: install-compute-common.inc Finalize installation --------------------- diff --git a/install-guide/source/configure_services/nova/install-nova-ubuntu.rst b/install-guide/source/install-compute-ubuntu.rst similarity index 94% rename from install-guide/source/configure_services/nova/install-nova-ubuntu.rst rename to install-guide/source/install-compute-ubuntu.rst index acfbbe5945..e1d59b8cfb 100644 --- a/install-guide/source/configure_services/nova/install-nova-ubuntu.rst +++ b/install-guide/source/install-compute-ubuntu.rst @@ -13,7 +13,7 @@ Install and configure components # apt-get install ceilometer-agent-compute -.. include:: install-nova-common.rst +.. include:: install-compute-common.inc Finalize installation --------------------- diff --git a/install-guide/source/install-compute.rst b/install-guide/source/install-compute.rst new file mode 100644 index 0000000000..c3873afdd4 --- /dev/null +++ b/install-guide/source/install-compute.rst @@ -0,0 +1,17 @@ +.. _install_compute: + +Install and Configure Compute Services +====================================== + +This section assumes that you already have a working OpenStack +environment with at least the following components installed: +Compute, Image Service, Identity. + +Note that installation and configuration vary by distribution. + +.. toctree:: + :maxdepth: 1 + + install-compute-obs.rst + install-compute-rdo.rst + install-compute-ubuntu.rst diff --git a/install-guide/source/install-controller.rst b/install-guide/source/install-controller.rst new file mode 100644 index 0000000000..b773f5288c --- /dev/null +++ b/install-guide/source/install-controller.rst @@ -0,0 +1,53 @@ +.. _install_controller: + +Install and Configure Controller Services +========================================= + +This section assumes that you already have a working OpenStack +environment with at least the following components installed: +Compute, Image Service, Identity. + +Note that installation and configuration vary by distribution. + +Ceilometer +---------- + +.. toctree:: + :maxdepth: 1 + + install-base-obs.rst + install-base-rdo.rst + install-base-ubuntu.rst + +Additional steps are required to configure services to interact with +ceilometer: + +Cinder +------ + +.. toctree:: + :maxdepth: 1 + + cinder/install-cinder-obs.rst + cinder/install-cinder-rdo.rst + cinder/install-cinder-ubuntu.rst + +Glance +------ + +.. toctree:: + :maxdepth: 1 + + glance/install-glance-obs.rst + glance/install-glance-rdo.rst + glance/install-glance-ubuntu.rst + +Swift +----- + +.. toctree:: + :maxdepth: 1 + + swift/install-swift-obs.rst + swift/install-swift-rdo.rst + swift/install-swift-ubuntu.rst diff --git a/install-guide/source/configure_services/swift/install-swift-config-common.rst b/install-guide/source/swift/install-swift-config-common.inc similarity index 100% rename from install-guide/source/configure_services/swift/install-swift-config-common.rst rename to install-guide/source/swift/install-swift-config-common.inc diff --git a/install-guide/source/configure_services/swift/install-swift-obs.rst b/install-guide/source/swift/install-swift-obs.rst similarity index 87% rename from install-guide/source/configure_services/swift/install-swift-obs.rst rename to install-guide/source/swift/install-swift-obs.rst index e0680111a1..b83e549046 100644 --- a/install-guide/source/configure_services/swift/install-swift-obs.rst +++ b/install-guide/source/swift/install-swift-obs.rst @@ -8,7 +8,7 @@ Object Storage meters. Your environment must include the Object Storage service. -.. include:: install-swift-prereq-common.rst +.. include:: install-swift-prereq-common.inc Install components ------------------ @@ -19,7 +19,7 @@ Install components # zypper install python-ceilometermiddleware -.. include:: install-swift-config-common.rst +.. include:: install-swift-config-common.inc Finalize installation --------------------- diff --git a/install-guide/source/configure_services/swift/install-swift-prereq-common.rst b/install-guide/source/swift/install-swift-prereq-common.inc similarity index 100% rename from install-guide/source/configure_services/swift/install-swift-prereq-common.rst rename to install-guide/source/swift/install-swift-prereq-common.inc diff --git a/install-guide/source/configure_services/swift/install-swift-rdo.rst b/install-guide/source/swift/install-swift-rdo.rst similarity index 87% rename from install-guide/source/configure_services/swift/install-swift-rdo.rst rename to install-guide/source/swift/install-swift-rdo.rst index 14a34f6539..b31dc50b0e 100644 --- a/install-guide/source/configure_services/swift/install-swift-rdo.rst +++ b/install-guide/source/swift/install-swift-rdo.rst @@ -8,7 +8,7 @@ Object Storage meters. Your environment must include the Object Storage service. -.. include:: install-swift-prereq-common.rst +.. include:: install-swift-prereq-common.inc Install components ------------------ @@ -19,7 +19,7 @@ Install components # yum install python-ceilometermiddleware -.. include:: install-swift-config-common.rst +.. include:: install-swift-config-common.inc Finalize installation --------------------- diff --git a/install-guide/source/configure_services/swift/install-swift-ubuntu.rst b/install-guide/source/swift/install-swift-ubuntu.rst similarity index 85% rename from install-guide/source/configure_services/swift/install-swift-ubuntu.rst rename to install-guide/source/swift/install-swift-ubuntu.rst index 99421c1332..1e7c146ff1 100644 --- a/install-guide/source/configure_services/swift/install-swift-ubuntu.rst +++ b/install-guide/source/swift/install-swift-ubuntu.rst @@ -8,7 +8,7 @@ Object Storage meters. Your environment must include the Object Storage service. -.. include:: install-swift-prereq-common.rst +.. include:: install-swift-prereq-common.inc Install components ------------------ @@ -19,7 +19,7 @@ Install components # apt-get install python-ceilometermiddleware -.. include:: install-swift-config-common.rst +.. include:: install-swift-config-common.inc Finalize installation ---------------------