summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/source/install/common_prerequisites.rst2
-rw-r--r--doc/source/install/create-zone.rst21
-rw-r--r--doc/source/install/install-obs.rst13
-rw-r--r--doc/source/install/install-rdo.rst13
-rw-r--r--doc/source/install/install-ubuntu.rst31
-rw-r--r--doc/source/install/verify.rst21
6 files changed, 59 insertions, 42 deletions
diff --git a/doc/source/install/common_prerequisites.rst b/doc/source/install/common_prerequisites.rst
index af2705a7..24da1da7 100644
--- a/doc/source/install/common_prerequisites.rst
+++ b/doc/source/install/common_prerequisites.rst
@@ -36,4 +36,4 @@ you must create service credentials and API endpoints.
.. code-block:: console
$ openstack endpoint create --region RegionOne \
- dns public http://controller:9001/ \ No newline at end of file
+ dns public http://controller:9001/
diff --git a/doc/source/install/create-zone.rst b/doc/source/install/create-zone.rst
index 548141fe..f2ba7dfc 100644
--- a/doc/source/install/create-zone.rst
+++ b/doc/source/install/create-zone.rst
@@ -79,3 +79,24 @@ In environments that include the DNS service, you can create a DNS Zone.
.. code-block:: console
$ openstack zone delete example.com.
+ +----------------+--------------------------------------+
+ | Field | Value |
+ +----------------+--------------------------------------+
+ | action | DELETE |
+ | attributes | |
+ | created_at | 2017-07-12T03:26:25.000000 |
+ | description | None |
+ | email | dnsmaster@example.com |
+ | id | 4a21a893-2c58-4797-82ed-19fcef7c418d |
+ | masters | |
+ | name | example.com. |
+ | pool_id | 794ccc2c-d751-44fe-b57f-8894c9f5c842 |
+ | project_id | d53f80b5a22b4962a176935eea23f9c4 |
+ | serial | 1499830029 |
+ | status | PENDING |
+ | transferred_at | None |
+ | ttl | 3600 |
+ | type | PRIMARY |
+ | updated_at | 2017-07-12T03:27:25.000000 |
+ | version | 4 |
+ +----------------+--------------------------------------+
diff --git a/doc/source/install/install-obs.rst b/doc/source/install/install-obs.rst
index 954e34cd..f113082b 100644
--- a/doc/source/install/install-obs.rst
+++ b/doc/source/install/install-obs.rst
@@ -31,7 +31,7 @@ Install and configure components
.. code-block:: console
# mysql -u root -p
- MariaDB [(none)]> CREATE DATABASE designate;
+ MariaDB [(none)]> CREATE DATABASE designate CHARACTER SET utf8 COLLATE utf8_general_ci;
MariaDB [(none)]> GRANT ALL PRIVILEGES ON designate.* TO 'designate'@'localhost' \
IDENTIFIED BY 'DESIGNATE_DBPASS';
MariaDB [(none)]> GRANT ALL PRIVILEGES ON designate.* TO 'designate'@'%' \
@@ -41,7 +41,7 @@ Install and configure components
.. code-block:: console
- # zypper install bind
+ # zypper install bind bind-utils
#. Add the following options in the ``/etc/named.conf`` file:
@@ -51,7 +51,9 @@ Install and configure components
...
allow-new-zones yes;
request-ixfr no;
+ listen-on port 53 { 127.0.0.1; };
recursion no;
+ allow-query { 127.0.0.1; };
};
#. Create an RNDC Key:
@@ -65,12 +67,7 @@ Install and configure components
.. code-block:: none
...
- # This should be the contents of ``/etc/designate/rndc.key``
- key "designate" {
- algorithm hmac-md5;
- secret "OAkHNQy0m6UPcv55fiVAPw==";
- };
- # End of content from ``/etc/designate/rndc.key``
+ include "/etc/designate/rndc.key";
controls {
inet 127.0.0.1 port 953
diff --git a/doc/source/install/install-rdo.rst b/doc/source/install/install-rdo.rst
index 6a34838a..ca141676 100644
--- a/doc/source/install/install-rdo.rst
+++ b/doc/source/install/install-rdo.rst
@@ -31,7 +31,7 @@ Install and configure components
.. code-block:: console
# mysql -u root -p
- MariaDB [(none)]> CREATE DATABASE designate;
+ MariaDB [(none)]> CREATE DATABASE designate CHARACTER SET utf8 COLLATE utf8_general_ci;
MariaDB [(none)]> GRANT ALL PRIVILEGES ON designate.* TO 'designate'@'localhost' \
IDENTIFIED BY 'DESIGNATE_DBPASS';
MariaDB [(none)]> GRANT ALL PRIVILEGES ON designate.* TO 'designate'@'%' \
@@ -41,7 +41,7 @@ Install and configure components
.. code-block:: console
- # yum install bind
+ # yum install bind bind-utils
#. Add the following options in the ``/etc/named.conf`` file:
@@ -51,7 +51,9 @@ Install and configure components
...
allow-new-zones yes;
request-ixfr no;
+ listen-on port 53 { 127.0.0.1; };
recursion no;
+ allow-query { 127.0.0.1; };
};
#. Create an RNDC Key:
@@ -65,12 +67,7 @@ Install and configure components
.. code-block:: none
...
- # This should be the contents of ``/etc/designate/rndc.key``
- key "designate" {
- algorithm hmac-md5;
- secret "OAkHNQy0m6UPcv55fiVAPw==";
- };
- # End of content from ``/etc/designate/rndc.key``
+ include "/etc/designate/rndc.key";
controls {
inet 127.0.0.1 port 953
diff --git a/doc/source/install/install-ubuntu.rst b/doc/source/install/install-ubuntu.rst
index d13f92df..f8d4e1ef 100644
--- a/doc/source/install/install-ubuntu.rst
+++ b/doc/source/install/install-ubuntu.rst
@@ -31,7 +31,7 @@ Install and configure components
.. code-block:: console
# mysql -u root -p
- mysql> CREATE DATABASE designate;
+ mysql> CREATE DATABASE designate CHARACTER SET utf8 COLLATE utf8_general_ci;
mysql> GRANT ALL PRIVILEGES ON designate.* TO 'designate'@'localhost' \
IDENTIFIED BY 'DESIGNATE_DBPASS';
mysql> GRANT ALL PRIVILEGES ON designate.* TO 'designate'@'%' \
@@ -41,18 +41,7 @@ Install and configure components
.. code-block:: console
- # apt-get install bind9
-
-#. Add the following options in the ``/etc/bind/named.conf.options`` file:
-
- .. code-block:: none
-
- options {
- ...
- allow-new-zones yes;
- request-ixfr no;
- recursion no;
- };
+ # apt-get install bind9 bind9utils bind9-doc
#. Create an RNDC Key:
@@ -60,17 +49,21 @@ Install and configure components
# rndc-confgen -a -k designate -c /etc/designate/rndc.key
-#. Add the key to ``/etc/bind/named.conf``:
+#. Add the following options in the ``/etc/bind/named.conf.options`` file:
.. code-block:: none
...
- # This should be the contents of ``/etc/designate/rndc.key``
- key "designate" {
- algorithm hmac-md5;
- secret "OAkHNQy0m6UPcv55fiVAPw==";
+ include "/etc/designate/rndc.key";
+
+ options {
+ ...
+ allow-new-zones yes;
+ request-ixfr no;
+ listen-on port 53 { 127.0.0.1; };
+ recursion no;
+ allow-query { 127.0.0.1; };
};
- # End of content from ``/etc/designate/rndc.key``
controls {
inet 127.0.0.1 port 953
diff --git a/doc/source/install/verify.rst b/doc/source/install/verify.rst
index 4be90609..b8b21627 100644
--- a/doc/source/install/verify.rst
+++ b/doc/source/install/verify.rst
@@ -20,21 +20,30 @@ Verify operation of the DNS service.
.. code-block:: console
+ $ 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
+
$ openstack dns service list
+--------------------------------------+--------------------------+--------------+--------+-------+--------------+
| id | hostname | service_name | status | stats | capabilities |
+--------------------------------------+--------------------------+--------------+--------+-------+--------------+
- | 14283849-ff64-4467-9cbb-d9050ffa08c0 | vagrant-ubuntu-trusty-64 | central | UP | - | - |
- | eb7d938f-5b24-4c9b-b4f7-05b9a8ea45f2 | vagrant-ubuntu-trusty-64 | api | UP | - | - |
- | 5dca293e-5fa2-4a3d-b486-4debad920da3 | vagrant-ubuntu-trusty-64 | zone_manager | UP | - | - |
- | 487e7215-6f61-495d-87b3-86be09406750 | vagrant-ubuntu-trusty-64 | mdns | UP | - | - |
- | 6b1d1de6-c820-4843-993b-663fca73f905 | vagrant-ubuntu-trusty-64 | pool_manager | UP | - | - |
+ | 918a8f6e-9e7e-453e-8583-cbefa7ae7f8f | vagrant-ubuntu-trusty-64 | central | UP | - | - |
+ | 982f78d5-525a-4c36-af26-a09aa39de5d7 | vagrant-ubuntu-trusty-64 | api | UP | - | - |
+ | eda2dc16-ad27-4ee1-b091-bb75b6ceaffe | vagrant-ubuntu-trusty-64 | mdns | UP | - | - |
+ | 00c5c372-e630-49b1-a6b6-17e3fa4544ea | vagrant-ubuntu-trusty-64 | worker | UP | - | - |
+ | 8cdaf2e9-accd-4665-8e9e-be26f1ccfe4a | vagrant-ubuntu-trusty-64 | producer | UP | - | - |
+--------------------------------------+--------------------------+--------------+--------+-------+--------------+
.. note::
This output should indicate at least one of each of the ``central``,
- ``api``, ``zone_manager``, ``mdns`` and ``pool_manager`` components
+ ``api``, ``producer``, ``mdns`` and ``worker`` components
on the controller node.
This output may differ slightly depending on the distribution.