6 Commits

Author SHA1 Message Date
Zuul
b6173acb8f Merge "Clean up DefaultPasswors" 2021-07-02 12:51:40 +00:00
Takashi Kajinami
f86a22d338 Clean up DefaultPasswors
DefaultPasswords is supposed to have been removed[1] but there still
exist some leftovers. This change removes all of the remaining usage.

[1] 7f195ff9a81c97469cd3c74d441c28c3b07d34ba

Change-Id: I4cd0076378c3e6b99cec62b0794ce68787256a1b
2021-06-08 22:56:07 +09:00
ramishra
464bc1e7f7 Simplify sshd, timemaster and timesync service templates
Change-Id: I710abcfa8efdbc89beb67d9750938823a626d038
2021-05-24 14:50:06 +05:30
ramishra
b253d564f7 Use server side env merging for ServiceNetMap/VipSubnetMap
This simplifies the ServiceNetMap/VipSubnetMap interfaces
to use parameter merge strategy and removes the *Defaults
interfaces.

Change-Id: Ic73628a596e9051b5c02435b712643f9ef7425e3
2021-05-19 10:16:58 +05:30
ramishra
c9991c2e31 Use 'wallaby' heat_template_version
With I57047682cfa82ba6ca4affff54fab5216e9ba51c Heat has added
a new template version for wallaby. This would allow us to use
2-argument variant of the ``if`` function that would allow for
 e.g. conditional definition of resource properties and help
cleanup templates. If only two arguments are passed to ``if``
function, the entire enclosing item is removed when the condition
is false.

Change-Id: I25f981b60c6a66b39919adc38c02a051b6c51269
2021-03-31 17:35:12 +05:30
Haresh Khandelwal
98c48b2299 Config parameters for timemaster service
timemaster service provides HA between different
time service i.e chrony, PTP. When timemaster service runs,
it spwans instances/child processes of chronyd, ptp4l and
phy2sys. Look at below output.

[root@hareshcomputesriov-0 heat-admin]# systemctl status timemaster
● timemaster.service - Synchronize system clock to NTP and PTP time
                       sources
   Loaded: loaded (/usr/lib/systemd/system/timemaster.service; disabled;
                   vendor preset: disabled)
   Active: active (running) since Tue 2020-08-11 17:24:45 UTC; 3s ago
 Main PID: 544428 (timemaster)
    Tasks: 4 (limit: 357097)
   Memory: 2.4M
   CGroup: /system.slice/timemaster.service
           ├─544428 /usr/sbin/timemaster -f /etc/timemaster.conf
           ├─544429 /usr/sbin/chronyd -n
                                      -f /var/run/timemaster/chrony.conf
           ├─544430 /usr/sbin/ptp4l -l 5
                                    -f /var/run/timemaster/ptp4l.0.conf
                                    -H -i eno1
           └─544431 /usr/sbin/phc2sys -l 5 -a -r -R 1.00
                                   -z /var/run/timemaster/ptp4l.0.socket
                                   -t [0:eno1] -n 0 -E ntpshm -M 0

Timemaster service uses /etc/chrony.conf and /etc/ptp4l.conf to create
runtime instance for these 2 timeservices. These 2 time services sync to
their respective time source. Timemaster provides HA between chrony
and PTP (between different PTP domains as well which is not part of
this patch).Timemaster compares all time sources and use the best
sources to synchronize the system clock. if chronyd commuication breaks
then timemaster will set system time with PTP grand master's provided
time and vice a versa.

2 new parameters added by this patch in order to make above work.

In order to use timemaster service, we need to remove Timesync and
add TimeMaster in roles_data.yaml for the role we desire to have
Timemaster service.

    - OS::TripleO::Services::TimeMaster

Change-Id: I32e9d17132d188aaddc5f5be578643a5f25ea375
Closes-Bug: #1893025
Depends-On: https://review.opendev.org/#/c/748431/
Depends-On: https://review.opendev.org/#/c/749093/
2021-01-28 21:23:13 +05:30