ntp: Add setting to configure options

Release.toml

@@ -292,4 +292,5 @@ version = "1.20.0"
     "migrate_v1.20.0_corndog-services-cfg-v0-1-0.lz4",
     "migrate_v1.20.0_bootstrap-containers-config-file-v0-1-0.lz4",
     "migrate_v1.20.0_bootstrap-containers-services-cfg-v0-1-0.lz4",
+    "migrate_v1.20.0_add-ntp-default-options-v0-1-0.lz4",
 ]

packages/chrony/chrony-conf

@@ -2,7 +2,7 @@
 ntp = "v1"
 +++
 {{#each settings.ntp.time-servers}}
-pool {{this}} iburst
+pool {{this}}{{#each ../settings.ntp.options}} {{this}}{{/each}}
 {{/each}}
 driftfile /var/lib/chrony/drift
 makestep 1.0 3

sources/Cargo.toml

@@ -78,6 +78,7 @@ members = [
     "api/migration/migrations/v1.20.0/corndog-services-cfg-v0-1-0",
     "api/migration/migrations/v1.20.0/bootstrap-containers-config-file-v0-1-0",
     "api/migration/migrations/v1.20.0/bootstrap-containers-services-cfg-v0-1-0",
+    "api/migration/migrations/v1.20.0/add-ntp-default-options-v0-1-0",
 
     "bloodhound",
 

sources/api/migration/migrations/v1.20.0/add-ntp-default-options-v0-1-0/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "add-ntp-default-options-v0-1-0"
+version = "0.1.0"
+authors = ["Dom Goodwin <[email protected]>"]
+license = "Apache-2.0 OR MIT"
+edition = "2021"
+publish = false
+
+[dependencies]
+migration-helpers = { path = "../../../migration-helpers", version = "0.1.0"}

sources/api/migration/migrations/v1.20.0/add-ntp-default-options-v0-1-0/src/main.rs

@@ -0,0 +1,18 @@
+use migration_helpers::common_migrations::AddSettingsMigration;
+use migration_helpers::{migrate, Result};
+use std::process;
+
+/// We added the ability to set additional options for NTP
+fn run() -> Result<()> {
+    migrate(AddSettingsMigration(&["settings.ntp.options"]))
+}
+
+// Returning a Result from main makes it print a Debug representation of the error, but with Snafu
+// we have nice Display representations of the error, so we wrap "main" (run) and print any error.
+// https://github.com/shepmaster/snafu/issues/110
+fn main() {
+    if let Err(e) = run() {
+        eprintln!("{}", e);
+        process::exit(1);
+    }
+}

sources/api/openapi.yaml

@@ -120,6 +120,10 @@ components:
               type: array
               items:
                 type: string
+            options:
+              type: array
+              items:
+                type: string
         network:
           type: object
           properties:

sources/models/shared-defaults/defaults.toml

@@ -119,6 +119,7 @@ template-path = "/usr/share/templates/hosts"
 
 [settings.ntp]
 time-servers = ["169.254.169.123", "2.amazon.pool.ntp.org"]
+options = ["iburst"]
 
 [services.ntp]
 configuration-files = ["chrony-conf"]

sources/settings-extensions/ntp/src/lib.rs

@@ -8,6 +8,7 @@ use std::convert::Infallible;
 #[model(impl_default = true)]
 pub struct NtpSettingsV1 {
     time_servers: Vec<Url>,
+    options: Vec<String>,
 }
 
 type Result<T> = std::result::Result<T, Infallible>;
@@ -64,7 +65,8 @@ mod test {
         assert_eq!(
             NtpSettingsV1::generate(None, None),
             Ok(GenerateResult::Complete(NtpSettingsV1 {
-                time_servers: None
+                time_servers: None,
+                options: None,
             }))
         )
     }
@@ -85,4 +87,18 @@ mod test {
         let results = serde_json::to_string(&ntp).unwrap();
         assert_eq!(results, test_json);
     }
+
+    #[test]
+    fn test_options_ntp() {
+        let test_json = r#"{"time-servers":["https://example.net","http://www.example.com"],"options":["minpoll","1","maxpoll","2"]}"#;
+
+        let ntp: NtpSettingsV1 = serde_json::from_str(test_json).unwrap();
+        assert_eq!(
+            ntp.options.clone().unwrap(),
+            vec!("minpoll", "1", "maxpoll", "2",)
+        );
+
+        let results = serde_json::to_string(&ntp).unwrap();
+        assert_eq!(results, test_json);
+    }
 }