Skip to content

Load initial config file with the default values#177

Merged
engelmi merged 1 commit into
eclipse-bluechi:mainfrom
ArtiomDivak:issue-147
Mar 16, 2023
Merged

Load initial config file with the default values#177
engelmi merged 1 commit into
eclipse-bluechi:mainfrom
ArtiomDivak:issue-147

Conversation

@ArtiomDivak

@ArtiomDivak ArtiomDivak commented Mar 6, 2023

Copy link
Copy Markdown
Contributor

For a full description please read here
#147.
For each of the node types [hirte, agent] hirte
will get the default config from the default
files located in /usr/shar/hirte/{hirte|agent}
into the hashmap and only after that it will
get the custome config that the usr changed

Fixes: #147
Signed-off-by: ArtiomDivak adivak@redhat.com

@mwperina mwperina left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Please take a look at rpmbuild job error, you need to update hirte.spec.in to include default config files into RPM packages

Comment thread config/meson.build Outdated
Comment thread config/meson.build Outdated
Comment thread src/libhirte/common/config.h Outdated
Comment thread src/libhirte/common/config.h Outdated
@mwperina mwperina changed the title Issues 147 Load initial config file with the default values Mar 7, 2023
@mwperina

mwperina commented Mar 7, 2023

Copy link
Copy Markdown
Member

So I think 2 parts are missing:

  1. Add default confg files into hirte.spec.in so they are properly included in RPM
  2. Modify integration testing workflow to use logging to stderr instead of journald, because the tests checks stderr output

Comment thread config/meson.build Outdated
Comment thread config/meson.build
Comment thread hirte.spec.in Outdated
Comment thread hirte.spec.in Outdated
Comment thread src/libhirte/common/config.c
@mwperina

mwperina commented Mar 9, 2023

Copy link
Copy Markdown
Member

#183 should fix the error in e2e test job

@mwperina mwperina force-pushed the issue-147 branch 5 times, most recently from d0f9107 to 7cdf025 Compare March 10, 2023 09:45

@mwperina mwperina left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Patch is OK, but e2e workflow needs to be adapted to really install things into /usr/local instead of custom directory, because we require to load default configuration from /usr/local/share/[hirte|hirte-agent]/config/hirte-default.conf

@ArtiomDivak ArtiomDivak force-pushed the issue-147 branch 9 times, most recently from 7ed40ee to 0276ed2 Compare March 13, 2023 12:07
@ArtiomDivak ArtiomDivak force-pushed the issue-147 branch 2 times, most recently from 10cb14d to f78aa69 Compare March 13, 2023 12:46
@mwperina

Copy link
Copy Markdown
Member

Depends on #182

@mwperina mwperina force-pushed the issue-147 branch 4 times, most recently from e0ab202 to 0567266 Compare March 14, 2023 12:39
@mwperina

Copy link
Copy Markdown
Member

Hmm, it seems to me that debug logs are not shown in journald, strange ...

@Yarboa Yarboa left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggestion,
Please try dnf update, and rerun the tests
Maybe we should add dnf update in test/Container file,

@mwperina mwperina force-pushed the issue-147 branch 6 times, most recently from ee5f894 to 8e7e4b2 Compare March 14, 2023 16:15

@Yarboa Yarboa left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is there a specific issue for the journald ?
Is it related to the default config files mechanism?

Comment thread .github/workflows/e2e.yml
Comment thread config/meson.build

@engelmi engelmi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@Yarboa

Yarboa commented Mar 16, 2023

Copy link
Copy Markdown
Contributor

LGTM @ArtiomDivak Please rebase

For a full description please read here
eclipse-bluechi#147.
For each of the node types [hirte, agent] hirte
will get the default config from the default
files located in /usr/shar/hirte/{hirte|agent}
into the hashmap and only after that it will
get the custome config that the usr changed

Fixes: eclipse-bluechi#147
Signed-off-by: Artiom Divak <adivak@redhat.com>
@engelmi engelmi merged commit 190eea9 into eclipse-bluechi:main Mar 16, 2023
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.

Add configuration file with the default values

4 participants