summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2017-12-21 15:43:41 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2017-12-21 15:53:23 +0800
commitc493f4f882025e29decf8904b5cd92abfbaf4a1c (patch)
tree230ff7046f4b8a904b449e6cba55f7b3b95ac841
parent6234176ae292a75dcda5520324cb7857d6105988 (diff)
Update compass-cobbler
1. update ubuntu signatrue to 16.04.3 2. enable ntpd service Change-Id: I36643aa01efcbe92017d6befa5746a1060e63c20 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
-rw-r--r--compass-cobbler/Dockerfile3
-rw-r--r--compass-cobbler/distro_signatures.json2
2 files changed, 3 insertions, 2 deletions
diff --git a/compass-cobbler/Dockerfile b/compass-cobbler/Dockerfile
index ddb3161..d877ad0 100644
--- a/compass-cobbler/Dockerfile
+++ b/compass-cobbler/Dockerfile
@@ -14,7 +14,8 @@ RUN yum -y update && \
systemctl enable cobblerd && \
systemctl enable httpd && \
systemctl enable dhcpd && \
- systemctl enable xinetd
+ systemctl enable xinetd && \
+ systemctl enable ntpd
# some tweaks on services
RUN sed -i -e 's/\(^.*disable.*=\) yes/\1 no/' /etc/xinetd.d/tftp && \
diff --git a/compass-cobbler/distro_signatures.json b/compass-cobbler/distro_signatures.json
index 21d22fe..71977b7 100644
--- a/compass-cobbler/distro_signatures.json
+++ b/compass-cobbler/distro_signatures.json
@@ -458,7 +458,7 @@
"xenial": {
"signatures":["dists", ".disk"],
"version_file":"Release|mini-info",
- "version_file_regex":"Codename: xenial|Ubuntu 16.04",
+ "version_file_regex":"Codename: xenial|Ubuntu 16.04.3",
"kernel_arch":"linux-headers-(.*)\\.deb",
"kernel_arch_regex":null,
"supported_arches":["i386","amd64"],