Skip to content
This repository has been archived by the owner on Oct 29, 2019. It is now read-only.

Salt 2018 compatibility #607

Merged
merged 5 commits into from
Aug 6, 2018
Merged

Conversation

bergmannf
Copy link
Contributor

Changes required to make our salt states run with salt 2018.3.

@@ -0,0 +1,24 @@
include:
- .main
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this legacy.sls invoked from anywhere? I cannot find any reference...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah - I forgot to add it back into init.sls.

I am still hoping to find a good way to not having to show the dependencies in the state files and the orchestration (orch.kubernetes) as well.

# Unfortunately using the default include mechanism of salt, to force order
# doesn't seem to work when running via orchestrate runner, so this is
# split in different files that the orch runner calls with explicit
# dependencies.
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't enough with an include and a require in the state that requires it? I find this split in different files a bit confusing...

@bergmannf
Copy link
Contributor Author

Test salt update

@bergmannf bergmannf changed the title [WIP] Salt 2018 Salt 2018 compatibility Jun 21, 2018
Copy link
Contributor

@inercia inercia left a comment

Choose a reason for hiding this comment

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

I find the whole dex refactoring very untidy and confusing. I would leave it as it was unless there is a very good reason for this change...

explicit-pre-dependency:
test.nop:
- require:
- sls: addons.dex.pre
Copy link
Contributor

Choose a reason for hiding this comment

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

Thiss is not very elegant.. do we really need this? We are already setting the order in the orchestration...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@inercia I also didn't like having to artificially splitting the states.

The problem I had with everything being in one file - the copying of the 15-secret.yaml did not happen in that case - I assumed that is because the macro-expansion have to run first, which already run other states.

However I just tried moving everything into one file again and this time it worked ...

@bergmannf bergmannf force-pushed the salt-2018 branch 4 times, most recently from ea7d58a to 4e78948 Compare June 21, 2018 11:40
@bergmannf bergmannf changed the title Salt 2018 compatibility [WIP] Salt 2018 compatibility Jun 21, 2018
@bergmannf
Copy link
Contributor Author

bergmannf commented Jun 27, 2018

@inercia Apparently the dex changes, that split the files, were unneeded after all - retrying it again it works while keeping it in one file. Guess I just was unlucky, when trying it the first time and something else prevented it from working (maybe the missing reactors).

Florian Bergmann added 5 commits July 19, 2018 17:19
(Attempt to make the automatic synchronization work for custom execution
modules - seems not to work)
Otherwise the kubectl_apply_dir_template macro will fail, as the file
does not exist when it tries to run `salt.hashutil.digest` on it.
Before this release the format did not use the 'interfaces' key.
Otherwise the states would fail if no nodes are returned in the `tgt`
expression.
@bergmannf bergmannf changed the title [WIP] Salt 2018 compatibility Salt 2018 compatibility Jul 19, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants