Skip to content

Commit

Permalink
fix: cloud initial creation
Browse files Browse the repository at this point in the history
docs: README sync
fix: version bump
closes: #478
Change-Id: Ie4ae224054d0eaa0439e5d17fd23fcc91e4108f1
  • Loading branch information
grafuls committed May 10, 2024
1 parent 7e146d6 commit 01063b5
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 6 deletions.
15 changes: 15 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 7 additions & 1 deletion src/quads/cli/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.")
Expand Down
8 changes: 3 additions & 5 deletions src/quads/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 01063b5

Please sign in to comment.