diff --git a/doc/source/install/install-obs.rst b/doc/source/install/install-obs.rst index 3476f42d1..8115ab3f7 100644 --- a/doc/source/install/install-obs.rst +++ b/doc/source/install/install-obs.rst @@ -104,12 +104,14 @@ Install and configure components .. code-block:: ini [keystone_authtoken] - auth_host = controller - auth_port = 35357 - auth_protocol = http - admin_tenant_name = service - admin_user = designate - admin_password = DESIGNATE_PASS + auth_type = password + username = designate + password = DESIGNATE_PASS + project_name = service + project_domain_name = Default + user_domain_name = Default + auth_uri = http://controller:5000/ + auth_url = http://controller:5000/ Replace ``DESIGNATE_PASS`` with the password you chose for the ``designate`` user in the Identity service. diff --git a/doc/source/install/install-rdo.rst b/doc/source/install/install-rdo.rst index 7c4d376e9..c797c9bdc 100644 --- a/doc/source/install/install-rdo.rst +++ b/doc/source/install/install-rdo.rst @@ -104,12 +104,14 @@ Install and configure components .. code-block:: ini [keystone_authtoken] - auth_host = controller - auth_port = 35357 - auth_protocol = http - admin_tenant_name = service - admin_user = designate - admin_password = DESIGNATE_PASS + auth_type = password + username = designate + password = DESIGNATE_PASS + project_name = service + project_domain_name = Default + user_domain_name = Default + auth_uri = http://controller:5000/ + auth_url = http://controller:5000/ Replace ``DESIGNATE_PASS`` with the password you chose for the ``designate`` user in the Identity service. diff --git a/doc/source/install/install-ubuntu.rst b/doc/source/install/install-ubuntu.rst index f8d4e1ef7..51fddfc3d 100644 --- a/doc/source/install/install-ubuntu.rst +++ b/doc/source/install/install-ubuntu.rst @@ -4,7 +4,7 @@ Install and configure for Ubuntu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This section describes how to install and configure the DNS -service for Ubuntu 14.04 (LTS). +service for Ubuntu 16.04 (LTS). .. include:: common_prerequisites.rst @@ -74,7 +74,7 @@ Install and configure components .. code-block:: console - # service bind9 restart + # systemctl restart bind9.service #. Edit the ``/etc/designate/designate.conf`` file and complete the following actions: @@ -97,12 +97,14 @@ Install and configure components .. code-block:: ini [keystone_authtoken] - auth_host = controller - auth_port = 35357 - auth_protocol = http - admin_tenant_name = service - admin_user = designate - admin_password = DESIGNATE_PASS + auth_type = password + username = designate + password = DESIGNATE_PASS + project_name = service + project_domain_name = Default + user_domain_name = Default + auth_uri = http://controller:5000/ + auth_url = http://controller:5000/ Replace ``DESIGNATE_PASS`` with the password you chose for the ``designate`` user in the Identity service. @@ -130,12 +132,14 @@ Install and configure components # su -s /bin/sh -c "designate-manage database sync" designate -#. Restart the designate central and API services: +#. Restart the designate central and API services and configure them + to start when the system boots: .. code-block:: console - # service designate-central restart - # service designate-api restart + # systemctl restart openstack-designate-central openstack-designate-api + + # systemctl enable openstack-designate-central openstack-designate-api #. Create a pools.yaml file in ``/etc/designate/pools.yaml`` with the following contents: @@ -200,10 +204,11 @@ Install and configure components # apt install designate-producer # apt install designate-mdns -#. Restart the designate and mDNS services: +#. Start the designate and mDNS services and configure them to start when the + system boots: .. code-block:: console - # service designate-worker restart - # service designate-producer restart - # service designate-mdns restart + # systemctl start designate-worker designate-producer designate-mdns + + # systemctl enable designate-worker designate-producer designate-mdns diff --git a/doc/source/install/install.rst b/doc/source/install/install.rst index 3a5a84a65..8be3a4a6c 100644 --- a/doc/source/install/install.rst +++ b/doc/source/install/install.rst @@ -7,15 +7,14 @@ This section describes how to install and configure the DNS service, code-named designate, on the controller node. This section assumes that you already have a working OpenStack -environment with at least the following components installed: -Identity service, Image service, Compute service, and Networking service. +environment with at least the Identity service installed. Note that installation and configuration vary by distribution. .. toctree:: :maxdepth: 2 + install-obs.rst install-rdo.rst install-ubuntu.rst - install-obs.rst diff --git a/doc/source/install/next-steps.rst b/doc/source/install/next-steps.rst index d6987994d..1a02f5734 100644 --- a/doc/source/install/next-steps.rst +++ b/doc/source/install/next-steps.rst @@ -5,8 +5,8 @@ Next steps Your OpenStack environment now includes the designate service. -To add additional services, see the `additional OpenStack install documentation -`_. +To add additional services, see the `OpenStack install guide +`_. To learn more about the designate service, read the `Designate developer documentation `_. diff --git a/doc/source/install/verify.rst b/doc/source/install/verify.rst index b8b216271..d612f4c2f 100644 --- a/doc/source/install/verify.rst +++ b/doc/source/install/verify.rst @@ -22,12 +22,12 @@ Verify operation of the DNS service. $ ps -aux | grep designate - ../usr/bin/python /usr/local/bin/designate-mdns --config-file /etc/designate/designate.conf - ../usr/bin/python /usr/local/bin/designate-central --config-file /etc/designate/designate.conf - ../usr/bin/python /usr/local/bin/designate-agent --config-file /etc/designate/designate.conf - ../usr/bin/python /usr/local/bin/designate-api --config-file /etc/designate/designate.conf - ../usr/bin/python /usr/local/bin/designate-worker --config-file /etc/designate/designate.conf - ../usr/bin/python /usr/local/bin/designate-producer --config-file /etc/designate/designate.conf + ../usr/bin/python /usr/bin/designate-mdns --config-file /etc/designate/designate.conf + ../usr/bin/python /usr/bin/designate-central --config-file /etc/designate/designate.conf + ../usr/bin/python /usr/bin/designate-agent --config-file /etc/designate/designate.conf + ../usr/bin/python /usr/bin/designate-api --config-file /etc/designate/designate.conf + ../usr/bin/python /usr/bin/designate-worker --config-file /etc/designate/designate.conf + ../usr/bin/python /usr/bin/designate-producer --config-file /etc/designate/designate.conf $ openstack dns service list +--------------------------------------+--------------------------+--------------+--------+-------+--------------+