Merge "Support multi local chrony servers"

ansible/inventory/all-in-one

@@ -21,7 +21,7 @@ localhost       ansible_connection=local
 # You can explicitly specify which hosts run each project by updating the
 # groups in the sections below. Common services are grouped together.
 [chrony-server:children]
-control
+haproxy
 
 [chrony:children]
 network

ansible/inventory/multinode

@@ -41,7 +41,7 @@ monitoring
 # You can explicitly specify which hosts run each project by updating the
 # groups in the sections below. Common services are grouped together.
 [chrony-server:children]
-control
+haproxy
 
 [chrony:children]
 control

ansible/roles/chrony/templates/chrony.conf.j2

@@ -1,13 +1,16 @@
-{% for host in groups['chrony-server'] %}
+{% set keyfile = '/etc/chrony.keys' if kolla_base_distro in ['centos', 'oraclelinux', 'redhat'] else '/etc/chrony/chrony.keys' %}
-{% if inventory_hostname != host %}
+
-server {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }} iburst
+server {{ kolla_internal_vip_address }} iburst
-{% endif %}
+{# NOTE(jeffrey4l): external_ntp_servers may be None here #}
-{% endfor %}
+{% if external_ntp_servers %}
 {% for ntp_server in external_ntp_servers %}
 server {{ ntp_server }} iburst
 {% endfor %}
+{% endif %}
 
-keyfile /etc/chrony/chrony.keys
+user chrony
+
+keyfile {{ keyfile }}
 
 commandkey 1
 
@@ -26,13 +29,16 @@ dumpdir /var/lib/chrony
 
 {% if inventory_hostname in groups['chrony-server'] %}
 allow all
+# prevent chrony sync from self
+deny {{ kolla_internal_vip_address }}
+deny {{ api_interface_address }}
 local stratum 10
 {% else %}
 port 0
 deny all
 {% endif %}
 
-bindaddress {{ api_interface_address }}
+bindaddress {{ kolla_internal_vip_address }}
 
 logchange 0.5
 

ansible/roles/chrony/templates/chrony.json.j2

@@ -7,5 +7,17 @@
             "owner": "chrony",
             "perm": "0600"
         }
+    ],
+    "permissions": [
+        {
+            "path": "/var/log/kolla/chrony",
+            "owner": "chrony:kolla",
+            "recurse": true
+        },
+        {
+            "path": "/var/lib/chrony",
+            "owner": "chrony:chrony",
+            "recurse": true
+        }
     ]
 }

releasenotes/notes/move-chrony-server-group-depends-on-keepalived-27c60fbd1471cc29.yaml

@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    chrony server high available is implemented. And it depends on VIP now.
+    chrony-server group is moved to network node in default and must be the
+    same with haproxy group.