Skip to content

Commit 3bb7e80

Browse files
grafulsgerritforge-inc
authored andcommitted
Merge "1.1.4 Release Update"
2 parents 9d3222a + ca894dd commit 3bb7e80

5 files changed

Lines changed: 24 additions & 6 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -931,6 +931,7 @@ quads-cli --ls-available --schedule-start "2020-08-02 22:00" --schedule-end "202
931931
* Available in QUADS `1.1.4` or above as a tech preview (when we migrate fully to Flask this will be supplanted with a full UI).
932932
* This is provided via the `quads-web` systemd service or you can run it manually via `cd /opt/quads/web ; python3 main.py`
933933
* You will need to seed the `models` data for your systems using the new [host metadata feature](/docs/quads-host-metadata-search.md)
934+
* This is **not** available in containers as it's a tech preview but will be featured once our move from CherryPy to Flask is completed later.
934935

935936
![quads-available-web](/image/quads-available-web.png?raw=true)
936937

conf/quads.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ data_dir: .
1111
# display name for QUADS email notifications
1212
mail_display_name: "QUADS Scheduler"
1313
# set header for User-Agent:
14-
mail_user_agent: "Rufus Postman 1.1.3"
14+
mail_user_agent: "Rufus Postman 1.1.4"
1515
domain: example.com
1616
log: /opt/quads/log/quads.log
1717
quads_base_url: http://127.0.0.1:8080/

docs/quads-host-metadata-search.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,22 @@ In QUADS `1.1.4` and above we've implemented a metadata model in MongoDB that ca
1616
## How to Import Host Metadata
1717
### Modify YAML Host Data
1818
* Host metadata uses a standard YAML key/value pair format, here's a [reference example](../conf/hosts_metadata.yml)
19-
* We'll be providing a tool later to automatically interrogate and generate this for you across all or some subset of hosts, in lieu of this you'd want to modify this file to match your baremetal host details you want to capture.
2019
* Host metadata is not required unless you want to use it, **it is entirely optional**
2120

2221
### Add any Supporting Model Type
2322
* We list some example model types of baremetal systems we use, you will also want to edit the `models:` value so it has any additional system models you might use in the [QUADS Conf](../conf/hosts_metadata.yml#L238)
23+
* To generate a YAML metadata file for importing QUADS-managed hosts you can use this command:
24+
25+
```
26+
for h in $(quads-cli --ls-hosts) ; do echo "- name: $h" ; echo " model: $(echo $h | awk -F. '{ print $1 }' | awk -F- '{ print $NF }' | tr a-z A-Z)" ; done > /tmp/hosts_metadata.yml
27+
```
2428

2529
### Importing Host Metadata
2630

27-
* To import host metadata:
31+
* To import host metadata from a file:
2832

2933
```
30-
quads-cli --define-host-details --metadata conf/hosts_metadata.yml
34+
quads-cli --define-host-details --metadata /tmp/hosts_metadata.yml
3135
```
3236

3337
* Doing this again or modifying your `hosts_metadata.yml` file and re-importing will overwrite all values or remove ones that might have been removed from the QUADS database.

quads/config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ def quads_load_config(quads_config):
2424
quads_config_file = os.path.join(os.path.dirname(__file__), "../conf/quads.yml")
2525
conf = quads_load_config(quads_config_file)
2626

27-
QUADSVERSION = "1.1.3"
27+
QUADSVERSION = "1.1.4"
2828
QUADSCODENAME = "gaúcho"
29-
SUPPORTED = ["fc640", "r620", "r630", "r640", "r720", "r730xd", "r930", "r730", "r740xd", "r720xd"]
29+
SUPPORTED = ["fc640", "r620", "r630", "r640", "640", "r720", "r730xd", "r930", "r730", "r740xd", "740xd", "r720xd"]
3030
OFFSETS = {"em1": 0, "em2": 1, "em3": 2, "em4": 3, "em5": 4}
3131
TEMPLATES_PATH = os.path.join(os.path.dirname(__file__), "templates")
3232
INTERFACES = {

rpm/quads.spec

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,19 @@ fi;
128128

129129
%changelog
130130

131+
* Tue Nov 24 2020 Will Foster <wfoster@redhat.com>
132+
- 1.1.4 release
133+
- bare-metal host metadata model implemented
134+
- quads-cli now has --mod-cloud functionality
135+
- quads-cli now has --extend-cloud functionality
136+
- quads-cli manages broken systems now with
137+
--mark-broken, --mark-repaired and --ls-broken
138+
- asyncio enhancements
139+
- flask-based --ls-available ui tech preview, new
140+
service 'quads-web'
141+
- --ls-available now has --filter capability
142+
- bug fixes for quads and badfish
143+
131144
* Tue Apr 07 2020 Will Foster <wfoster@redhat.com>
132145
- 1.1.3 release
133146

0 commit comments

Comments
 (0)