Merge "Change Amsterdam by Beijing"

diff --git a/docs/guides/onap-developer/settingup/install-designate.rst b/docs/guides/onap-developer/settingup/install-designate.rst
index 9f9dde3..42000a4 100644 (file)
--- a/docs/guides/onap-developer/settingup/install-designate.rst
+++ b/docs/guides/onap-developer/settingup/install-designate.rst
@@ -53,7 +53,28 @@ The current design of kubernetes deployment installs DCAE into any openstack ins
 Few steps have to be performed. The detail of each steps are in `the config guide of Openstack Designate <https://docs.openstack.org/designate/latest/install/index.html>`:
 
 1. Install bind9 nameserver
-2. Configure it to accept dns updates and forward to your master DNS Server
+2. Configure it to accept dns updates and forward to your master DNS Server. Example configuration is below:
+   .. code:: bash
+    root@designate:~# cat /etc/bind/named.conf.options
+    include "/etc/bind/rndc.key";
+    options {
+        directory "/var/cache/bind";
+        allow-new-zones yes;
+        dnssec-validation auto;
+        listen-on port 53 { 10.203.157.79; };
+        forwarders {
+                8.8.8.8;
+                8.8.4.4;
+                };
+        forward only;
+        allow-query { any; };
+        recursion yes;
+        minimal-responses yes;
+        };
+    controls {
+        inet 10.203.157.79 port 953 allow { 10.203.157.79; } keys { "rndc-key"; };
+        };
+    root@designate:~# 
 3. Configure Designate in openstack. Please see `this guide <https://docs.openstack.org/mitaka/networking-guide/config-dns-int.html>` for more details.
 4. Create a pool pointing to your nameserver
 

diff --git a/docs/submodules/appc.git b/docs/submodules/appc.git
index e551a81..dda8504 160000 (submodule)
--- a/docs/submodules/appc.git
+++ b/docs/submodules/appc.git
@@ -1 +1 @@
-Subproject commit e551a81ab48b77b5be881699b4176bbc337bbbce
+Subproject commit dda85044d9534f1fe17c6fcb3a28b54e20dcae29

diff --git a/docs/submodules/cli.git b/docs/submodules/cli.git
index 5d2f93c..8f21819 160000 (submodule)
--- a/docs/submodules/cli.git
+++ b/docs/submodules/cli.git
@@ -1 +1 @@
-Subproject commit 5d2f93c6fb594fb0197a082a4cf1ba6aea0ead02
+Subproject commit 8f21819de7f63856f087ad40ac0f36c644781e54

diff --git a/docs/submodules/dcaegen2.git b/docs/submodules/dcaegen2.git
index ef55ef2..13de887 160000 (submodule)
--- a/docs/submodules/dcaegen2.git
+++ b/docs/submodules/dcaegen2.git
@@ -1 +1 @@
-Subproject commit ef55ef2163dee32905bd10b0a0b3ea0f6a763322
+Subproject commit 13de8870c542c1cd87d24f1bdde5878c82276c8b

diff --git a/docs/submodules/holmes/engine-management.git b/docs/submodules/holmes/engine-management.git
index 56acc55..4417b8a 160000 (submodule)
--- a/docs/submodules/holmes/engine-management.git
+++ b/docs/submodules/holmes/engine-management.git
@@ -1 +1 @@
-Subproject commit 56acc55bf479d8b7a635fc91cecc9bcc9775bc59
+Subproject commit 4417b8ab450c39ccfa357d1314c5e7e31454e070

diff --git a/docs/submodules/holmes/rule-management.git b/docs/submodules/holmes/rule-management.git
index 9d61ac9..9b19d37 160000 (submodule)
--- a/docs/submodules/holmes/rule-management.git
+++ b/docs/submodules/holmes/rule-management.git
@@ -1 +1 @@
-Subproject commit 9d61ac9a63eb763ee5c11993a82e2dcfd6dbafc1
+Subproject commit 9b19d379b3f9ea0f1f31202b8c175f8e55fc9b0a

diff --git a/docs/submodules/msb/apigateway.git b/docs/submodules/msb/apigateway.git
index ae1f91f..b6e4ff5 160000 (submodule)
--- a/docs/submodules/msb/apigateway.git
+++ b/docs/submodules/msb/apigateway.git
@@ -1 +1 @@
-Subproject commit ae1f91f7459163a6ae5c7b902379cce7513e1f93
+Subproject commit b6e4ff577fcbbca210e8c57d477d637c1560191e

diff --git a/docs/submodules/msb/java-sdk.git b/docs/submodules/msb/java-sdk.git
index b0fd041..01b1098 160000 (submodule)
--- a/docs/submodules/msb/java-sdk.git
+++ b/docs/submodules/msb/java-sdk.git
@@ -1 +1 @@
-Subproject commit b0fd041c7ec97e762109c1a0700400bb2f3aef12
+Subproject commit 01b109873fa129319830a4619a01c503c139cd29

diff --git a/docs/submodules/multicloud/framework.git b/docs/submodules/multicloud/framework.git
index 9a0d43b..9a8d0bf 160000 (submodule)
--- a/docs/submodules/multicloud/framework.git
+++ b/docs/submodules/multicloud/framework.git
@@ -1 +1 @@
-Subproject commit 9a0d43b54519c8e08683e522255370ccba137902
+Subproject commit 9a8d0bfd808e4a3dd0f9e6a5753c89460ca71540

diff --git a/docs/submodules/policy/engine.git b/docs/submodules/policy/engine.git
index 82b62ca..6e00f46 160000 (submodule)
--- a/docs/submodules/policy/engine.git
+++ b/docs/submodules/policy/engine.git
@@ -1 +1 @@
-Subproject commit 82b62ca5dd3ae30aab7999b5959e1c07eb1d3d1f
+Subproject commit 6e00f46e0c2ee4dbbdb0e222e6f361210d1a0da1

diff --git a/docs/submodules/sdc.git b/docs/submodules/sdc.git
index 6f578c4..48a8470 160000 (submodule)
--- a/docs/submodules/sdc.git
+++ b/docs/submodules/sdc.git
@@ -1 +1 @@
-Subproject commit 6f578c479c73c2f5989e383355c28cf1c7a01c6b
+Subproject commit 48a84705a78038606f1bd162b826f074b7085e7c

diff --git a/docs/submodules/sdc/jtosca.git b/docs/submodules/sdc/jtosca.git
index 05d9b88..6263a57 160000 (submodule)
--- a/docs/submodules/sdc/jtosca.git
+++ b/docs/submodules/sdc/jtosca.git
@@ -1 +1 @@
-Subproject commit 05d9b88fd55c81ffce49f8e764a05af195cc24f7
+Subproject commit 6263a57c5bb2da0f89292313927cac3e83157a83

diff --git a/docs/submodules/sdc/sdc-distribution-client.git b/docs/submodules/sdc/sdc-distribution-client.git
index e8d8a37..5729888 160000 (submodule)
--- a/docs/submodules/sdc/sdc-distribution-client.git
+++ b/docs/submodules/sdc/sdc-distribution-client.git
@@ -1 +1 @@
-Subproject commit e8d8a37da95c6fea435e0b3e93a477b5aa45b9b1
+Subproject commit 5729888c9dc75c75ff62bce68a4690275ac0b8e3

diff --git a/docs/submodules/sdc/sdc-titan-cassandra.git b/docs/submodules/sdc/sdc-titan-cassandra.git
index 83a4e40..a9dba44 160000 (submodule)
--- a/docs/submodules/sdc/sdc-titan-cassandra.git
+++ b/docs/submodules/sdc/sdc-titan-cassandra.git
@@ -1 +1 @@
-Subproject commit 83a4e4067fd50cec9bdfbacf18f953cef62b52e6
+Subproject commit a9dba442b6acb1347a208825528374a157e45f8a

diff --git a/docs/submodules/sdc/sdc-tosca.git b/docs/submodules/sdc/sdc-tosca.git
index f524d3c..b0ed12f 160000 (submodule)
--- a/docs/submodules/sdc/sdc-tosca.git
+++ b/docs/submodules/sdc/sdc-tosca.git
@@ -1 +1 @@
-Subproject commit f524d3ccf7e3ede73c740830a7ffb0c7820fcc47
+Subproject commit b0ed12f587f7f87dedb0b838664800662bc4ca8e

diff --git a/docs/submodules/sdc/sdc-workflow-designer.git b/docs/submodules/sdc/sdc-workflow-designer.git
index 43bed0e..bbc0b40 160000 (submodule)
--- a/docs/submodules/sdc/sdc-workflow-designer.git
+++ b/docs/submodules/sdc/sdc-workflow-designer.git
@@ -1 +1 @@
-Subproject commit 43bed0e28512332aecc3b70f9e24840682c59e92
+Subproject commit bbc0b40602f42a6aac5e04fa6cea8507f7ae8f6e

diff --git a/docs/submodules/sdnc/oam.git b/docs/submodules/sdnc/oam.git
index f62137b..d21a1b3 160000 (submodule)
--- a/docs/submodules/sdnc/oam.git
+++ b/docs/submodules/sdnc/oam.git
@@ -1 +1 @@
-Subproject commit f62137b244e64bfaf0d9aa9b606597e59774ea27
+Subproject commit d21a1b3a5e05b5466c792d5ee7298df5ab714a51

diff --git a/docs/submodules/so.git b/docs/submodules/so.git
index 8ff992a..558a731 160000 (submodule)
--- a/docs/submodules/so.git
+++ b/docs/submodules/so.git
@@ -1 +1 @@
-Subproject commit 8ff992a2c526c3b652586fe21216de118294c5b9
+Subproject commit 558a73181640d0d19f7f05cab6e0b8568574b504

diff --git a/docs/submodules/so/libs.git b/docs/submodules/so/libs.git
index f0261ef..d413cf3 160000 (submodule)
--- a/docs/submodules/so/libs.git
+++ b/docs/submodules/so/libs.git
@@ -1 +1 @@
-Subproject commit f0261ef5d032d604cc553593ce694b73f6f179b3
+Subproject commit d413cf3266aa38b3a9c5bf37ce30c3de68b3ad55

diff --git a/docs/submodules/vfc/nfvo/driver/vnfm/svnfm.git b/docs/submodules/vfc/nfvo/driver/vnfm/svnfm.git
index eabd611..1635231 160000 (submodule)
--- a/docs/submodules/vfc/nfvo/driver/vnfm/svnfm.git
+++ b/docs/submodules/vfc/nfvo/driver/vnfm/svnfm.git
@@ -1 +1 @@
-Subproject commit eabd611557229b92fdf0f84da9628e5a72801dc3
+Subproject commit 16352314819e03143e91d76b3157a125d3e49f8d

diff --git a/docs/submodules/vfc/nfvo/lcm.git b/docs/submodules/vfc/nfvo/lcm.git
index 07163fe..e12434f 160000 (submodule)
--- a/docs/submodules/vfc/nfvo/lcm.git
+++ b/docs/submodules/vfc/nfvo/lcm.git
@@ -1 +1 @@
-Subproject commit 07163fee37f72a64c0ea6cfa94b7cd61a08c7a04
+Subproject commit e12434fe867b9e53555525c2548ee0200886a6df