From 01063b52f3b695b493412b60f739b192fcd2a913 Mon Sep 17 00:00:00 2001 From: Gonzalo Rafuls Date: Fri, 10 May 2024 21:48:18 +0200 Subject: [PATCH] fix: cloud initial creation docs: README sync fix: version bump closes: https://github.com/redhat-performance/quads/issues/478 Change-Id: Ie4ae224054d0eaa0439e5d17fd23fcc91e4108f1 --- README.md | 15 +++++++++++++++ src/quads/cli/cli.py | 8 +++++++- src/quads/config.py | 8 +++----- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 73f2aac1d..86b5091b3 100644 --- a/README.md +++ b/README.md @@ -132,6 +132,21 @@ QUADS automates the future scheduling, end-to-end provisioning and delivery of b - Documentation for setting up and using QUADS is available in detail within this repository. - Below is a high-level overview of a greenfield setup, some of this may exist already for you. +| Step | Documentation | Details | +|------|---------------|---------| +| General Architecture Overview | [docs](/docs/quads-workflow.md) | Architecture overview | +| Install and Setup Foreman/Satellite | [docs](https://theforeman.org/manuals/nightly/#3.InstallingForeman) | Not covered here | +| Setup Foreman/Satellite Validation Templates | [examples](/templates/README.md) | Templates for internal interface configs | +| Prepare Host and Network Environment | [docs](/docs/switch-host-setup.md) | Covers Juniper Environments, IPMI, Foreman | +| Install QUADS | [docs](#installing-quads) | Install via RPM | +| Install Wiki | [docs](#installing-wordpress-via-ansible) | Use Ansible to Deploy Wordpress | +| Configure Wiki | [docs](#setup-of-wordpress) | Configure Wordpress Pages and Plugins | +| Configure your QUADS Move Command | [docs](#quads-move-command) | Configure your provisioning and move actions | +| Configure QUADS Crons | [docs](#making-quads-run) | Tell QUADS how to manage your infrastructure | +| Add Clouds and Hosts | [docs](#adding-new-hosts-to-quads) | Configure your hosts and environments in QUADS | +| Host Metadata Model and Search | [docs](/docs/quads-host-metadata-search.md) | Host metadata info and filtering | +| Using JIRA with QUADS | [docs](/docs/using-jira-with-quads.md) | Optional JIRA tools and library for QUADS | + ## QUADS Workflow You can read about QUADS architecture, provisioning, visuals and workflow [in our documentation examples and screenshots](/docs/quads-workflow.md) diff --git a/src/quads/cli/cli.py b/src/quads/cli/cli.py index 9a141c2bd..13a39236d 100644 --- a/src/quads/cli/cli.py +++ b/src/quads/cli/cli.py @@ -849,7 +849,11 @@ def action_cloudresource(self): if cloud_response.status_code == 200: self.logger.info(f'Cloud {self.cli_args.get("cloud")} created.') - if not assignment and cloud and self.cli_args.get("cloud") != conf.get("spare_pool_name"): + if ( + not assignment + and self.cli_args.get("cloudticket") + and self.cli_args.get("cloud") != conf.get("spare_pool_name") + ): try: response = self.quads.insert_assignment(data) except (APIServerException, APIBadRequest) as ex: # pragma: no cover @@ -863,6 +867,8 @@ def action_cloudresource(self): raise CliException(str(ex)) if response.status_code == 200: self.logger.info("Assignment updated.") + else: + self.logger.warning("No assignment created or updated.") except ConnectionError: # pragma: no cover raise CliException("Could not connect to the quads-server, verify service is up and running.") diff --git a/src/quads/config.py b/src/quads/config.py index ad8567698..0b6afe665 100644 --- a/src/quads/config.py +++ b/src/quads/config.py @@ -24,9 +24,7 @@ def load_from_yaml(self, filepath: str = DEFAULT_CONF_PATH): for key, value in conf.items(): if hasattr(self, key): - logger.debug( - f"Key '{key}' is already defined on config class, not overriding" - ) + logger.debug(f"Key '{key}' is already defined on config class, not overriding") continue setattr(self, key, value) @@ -82,8 +80,8 @@ def API_URL(self): FPING_TIMEOUT = 10000 - QUADSVERSION = "1.1.7" - QUADSCODENAME = "gaucho" + QUADSVERSION = "2.0.0" + QUADSCODENAME = "bowie" SUPPORTED = [ "fc640",