Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OTA-2488: Remove SOTA_SECONDARY_CONFIG_DIR configuration variable #533

Merged
merged 1 commit into from
Jul 10, 2019

Conversation

mike-sul
Copy link
Collaborator

@mike-sul mike-sul commented Jul 1, 2019

Alignment with changes in this PR advancedtelematic/aktualizr#1246

Signed-off-by: Mike Sul ext-mykhaylo.sul@here.com

@mike-sul mike-sul force-pushed the refact/OTA-2488/virtual-secondary-refactory branch from 32ba259 to 9ed4f3e Compare July 5, 2019 05:53
@mike-sul
Copy link
Collaborator Author

mike-sul commented Jul 9, 2019

@patrickvacek @lbonn Let's decide what to do with it.

@@ -104,7 +104,7 @@ Your images will also need network connectivity to be able to reach an actual OT
* `SOTA_DEPLOY_CREDENTIALS` - when set to '1' (default value), deploys credentials to the built image. Override it in `local.conf` to built a generic image that can be provisioned manually after the build.
* `SOTA_CLIENT_PROV` - which provisioning method to use. Valid options are `aktualizr-shared-prov`, `aktualizr-device-prov`, and `aktualizr-device-prov-hsm`. For more information on these provisioning methods, see the https://docs.ota.here.com/client-config/client-provisioning-methods.html[OTA Connect documentation]. The default is `aktualizr-shared-prov`. This can also be set to an empty string to avoid using a provisioning recipe.
* `SOTA_CLIENT_FEATURES` - extensions to aktualizr. The only valid options are `hsm` (to build with HSM support) and `secondary-network` (to set up a simulated 'in-vehicle' network with support for a primary node with a DHCP server and a secondary node with a DHCP client).
* `SOTA_SECONDARY_CONFIG_DIR` - a directory containing JSON configuration files for virtual secondaries on the host. These will be installed into `/etc/sota/ecus` on the device and automatically provided to aktualizr.
* `SOTA_SECONDARY_CONFIG` - a file containing JSON configuration for secondaries. It will be installed into `/etc/sota/ecus` on the device and automatically provided to aktualizr. See link:https://github.com/advancedtelematic/aktualizr/blob/master/docs/posix-secondaries-bitbaking.adoc[here] for more details.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the bit about /var/sota/ecus accurate? And has aktualizr been bumped already such that the new method is the only way forward now? If yes to both, then this is fine. But how does the config file get on the device? I've forgotten.

Copy link
Collaborator Author

@mike-sul mike-sul Jul 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I am sure about /etc/sota/ecus - this is a folder that the secondaries configuration file is put in.
No, I haven't updated the reference to the desired version of aktualizr at meta-udpater, will do it.

But how does the config file get on the device?

If SOTA_SECONDARY_CONFIG is specified in the local.conf then the corresponding file will be installed into /etc/sota/ecus folder and /usr/lib/sota/conf.d/30-secondary-config.toml will reference to it.
If SOTA_SECONDARY_CONFIG is not specified in the local.conf then the config file will be auto-generated taking into account other configuration variables, see here for details on them https://github.com/advancedtelematic/aktualizr/blob/master/docs/posix-secondaries-bitbaking.adoc

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bumped the corresponding version of aktualizr.

…d way to configure secondaries). Bump corresponding version of aktualizr.

Signed-off-by: Mike Sul <ext-mykhaylo.sul@here.com>
@mike-sul mike-sul force-pushed the refact/OTA-2488/virtual-secondary-refactory branch from 9ed4f3e to 69eda84 Compare July 10, 2019 09:46
@pattivacek
Copy link
Collaborator

Looks good. Have you run oe-selftest? Since we have to bump aktualizr, it's more than just docs and we gotta play it safe. I can get a run started.

@mike-sul
Copy link
Collaborator Author

Looks good. Have you run oe-selftest? Since we have to bump aktualizr, it's more than just docs and we gotta play it safe. I can get a run started.

Yes, I have run them, but I suppose, I need to rerun them against the newly bumped version of aktalizr. So, please, run them, I will run some subset of them.

Copy link
Collaborator

@pattivacek pattivacek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oe-selftest passed except for the ostree and aktualizr-lite ptests. Not sure why for the latter, but it's not critical enough to prevent merging. Thanks! We probably want to backport this very soon.

@pattivacek pattivacek merged commit 6a11a18 into master Jul 10, 2019
@pattivacek pattivacek deleted the refact/OTA-2488/virtual-secondary-refactory branch July 10, 2019 14:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants