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.

Sign up for GitHub

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

Jump to bottom

Multiple environments: part 2 (antelope) #174

Merged
merged 6 commits into from
Nov 13, 2023
Merged

Multiple environments: part 2 (antelope) #174

merged 6 commits into from
Nov 13, 2023

Conversation

jovial
Copy link

@jovial jovial commented Sep 21, 2023

No description provided.

markgoddard and others added 3 commits September 19, 2023 17:27
@markgoddard @jovial
Use merge_configs and merge_yaml to generate Kolla custom config
4b1bf29 
This patch adds new functionality - merging base & environment specific
kolla config. This allows you to place common settings in the base
configuration and only keep environment specific settings in the
environment directories.

Change-Id: Id4588f4529a4522e68e22ce58711cb927fa68a9d
Story: 2002009
Task: 42903
(cherry picked from commit 428ef10)
@jovial
Add cached plugin
7267db3 
This is useful to cache expensive lookups.

Change-Id: I0748f7bd3e6f7f91e35b2178acb6973e99710f88
(cherry picked from commit a46b3eb)
@jovial
Kayobe environment dependencies
c3e3a3d 
Allows you to combine multiple environments by declaring any dependencies.

Story: 2002009
Task: 42911
Change-Id: I4d9f96ec4cf3c6cd0d28dfe5ddb239d863498a72
(cherry picked from commit 0ae9e8d)
@jovial jovial changed the title Draft: Multiple environments Multiple environments: part 2 (antelope) Oct 27, 2023
@jovial jovial force-pushed the feature/antelope/multiple-environments branch from 64d09bc to 1ff7072 Compare October 27, 2023 14:34
@jovial
Merge remote-tracking branch 'stackhpc/stackhpc/2023.1' into HEAD
3c0301d 
Change-Id: Id1ff60ad2617680d0c74ae6ccba10c779630a884
@jovial jovial force-pushed the feature/antelope/multiple-environments branch from 1ff7072 to 3c0301d Compare October 27, 2023 14:42
@jovial
Copy link
Author

jovial commented Oct 27, 2023

Testing here: stackhpc/stackhpc-kayobe-config#724

@jovial
Copy link
Author

jovial commented Nov 3, 2023 •
edited
Loading

Failed on SMS lab testing:

TASK [kolla-openstack : Ensure extra configuration files exist (strategy: merge_yaml)] **************************************************************************************
Thursday 02 November 2023  18:42:02 +0000 (0:00:00.020)       0:00:31.182 *****                                                                                              
changed: [localhost] => (item={'sources': ['/home/stack/will/antelope/src/kayobe-config/etc/kayobe/kolla/config/glance/policy.yaml'], 'dest': '/home/stack/will/antelope/src/
kayobe-config/etc/kolla/config/glance/policy.yaml', 'params': []})                                                                                                           
changed: [localhost] => (item={'sources': ['/home/stack/will/antelope/src/kayobe-config/etc/kayobe/kolla/config/grafana/provisioning.yaml'], 'dest': '/home/stack/will/antelo
pe/src/kayobe-config/etc/kolla/config/grafana/provisioning.yaml', 'params': []})                                                                                             
An exception occurred during task execution. To see the full traceback, use -vvv. The error was:                   ^                                                        
fatal: [localhost]: FAILED! =>                                                                                                                                               
  msg: |-                                
    Unexpected failure during module execution: while scanning for the next token
    found character '%' that cannot start any token
      in "<unicode string>", line 27, column 15:
                url: {% raw %} '{{ template "__alert_s ...
                      ^
  stdout: ''

As not valid yaml. We could be more backwards compatible if we fallback to templating files with a single source.

@jovial
Fallback to templating when only one source exists
45a2681 
This is a backwards compatability improvement, since it was previously
permitted to have a config file that templated to invalid yaml/ini.

Change-Id: I53a0894cc64e83c7342a82ad987b7e5a4696ece2
Closes-Bug: #2042690
(cherry picked from commit 86d9a53)
@jovial
Stop merging config when symlink points to same file
8e58753 
This can result in duplicated configuration options.

Change-Id: I4dd6ffae027345b8c1cc217a63e85f8af7fc9746
Closes-Bug: #2042689
(cherry picked from commit 2f4b45c)
@jovial jovial marked this pull request as ready for review November 13, 2023 11:17
@jovial jovial requested a review from a team as a code owner November 13, 2023 11:17
@jovial jovial merged commit a9c3d37 into stackhpc/2023.1 Nov 13, 2023
3 checks passed
@jovial jovial deleted the feature/antelope/multiple-environments branch November 13, 2023 12:57
jovial added a commit to stackhpc/stackhpc-kayobe-config that referenced this pull request Nov 13, 2023
@jovial
Adds kolla config merging options
b81a2f9 
See: stackhpc/kayobe#174
@jovial jovial mentioned this pull request Nov 13, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@markgoddard markgoddard markgoddard approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jovial @markgoddard