From 2a66a5781061e1b73a67be842fb7b7499dce7a37 Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Mon, 10 Oct 2022 18:09:22 +0200 Subject: [PATCH] Reoprganize for installability In order to make stackmon/cloudmon easy installable it is required to put ansible playbooks and roles either into the collection or place it inside the package. Collection is a good thing, however in this case it dramatically reduces ease of development (at least for the initial phase). For that reason place it inside the project locally with eventuall splitting out into the collection later. This will require starting using ansible-builder for prreparing execution container. --- .gitignore | 1 + ansible/inventory/group_vars/all.yaml | 1 - ansible/inventory/hosts | 11 ------- .../inventory_quickstart/group_vars/all.yml | 2 -- ansible/inventory_quickstart/hosts | 31 ------------------- cloudmon/__init__.py | 18 ----------- .../project/configure_backend_members.yaml | 0 .../ansible}/project/install_epmon.yaml | 0 .../ansible}/project/install_executor.yaml | 0 .../ansible}/project/install_grafana.yaml | 0 .../ansible}/project/install_graphite.yaml | 0 .../ansible}/project/install_postgresql.yaml | 0 .../ansible}/project/install_scheduler.yaml | 0 .../ansible}/project/install_statsd.yaml | 0 .../ansible}/project/manage_databases.yaml | 0 .../ansible}/project/roles/.keep | 0 .../project/roles/apimon_executor/README.md | 0 .../roles/apimon_executor/defaults/main.yml | 0 .../roles/apimon_executor/handlers/main.yml | 0 .../roles/apimon_executor/tasks/main.yml | 0 .../templates/apimon-executor.service.j2 | 0 .../apimon_executor/templates/env_executor | 0 .../apimon_executor/templates/logging.conf | 0 .../roles/apimon_executor/tests/inventory | 0 .../roles/apimon_executor/tests/test.yml | 0 .../roles/apimon_executor/vars/Debian.yaml | 0 .../roles/apimon_executor/vars/RedHat.yaml | 0 .../roles/apimon_executor/vars/main.yaml | 0 .../project/roles/apimon_scheduler/README.md | 0 .../roles/apimon_scheduler/defaults/main.yml | 0 .../roles/apimon_scheduler/handlers/main.yml | 0 .../roles/apimon_scheduler/tasks/firewall.yml | 0 .../roles/apimon_scheduler/tasks/main.yml | 0 .../templates/apimon-scheduler.service.j2 | 0 .../apimon_scheduler/templates/env_scheduler | 0 .../apimon_scheduler/templates/logging.conf | 0 .../roles/apimon_scheduler/tests/inventory | 0 .../roles/apimon_scheduler/tests/test.yml | 0 .../roles/apimon_scheduler/vars/Debian.yaml | 0 .../roles/apimon_scheduler/vars/RedHat.yaml | 0 .../roles/apimon_scheduler/vars/main.yaml | 0 .../ansible}/project/roles/epmon/README.md | 0 .../project/roles/epmon/defaults/main.yml | 0 .../project/roles/epmon/handlers/main.yml | 0 .../project/roles/epmon/tasks/main.yml | 0 .../project/roles/epmon/templates/env_epmon | 0 .../roles/epmon/templates/epmon.service.j2 | 0 .../roles/epmon/templates/logging.conf | 0 .../project/roles/epmon/tests/inventory | 0 .../project/roles/epmon/tests/test.yml | 0 .../project/roles/epmon/vars/Debian.yaml | 0 .../project/roles/epmon/vars/RedHat.yaml | 0 .../project/roles/epmon/vars/main.yaml | 0 .../project/roles/firewalld/README.rst | 0 .../roles/firewalld/defaults/main.yaml | 0 .../roles/firewalld/handlers/main.yaml | 0 .../project/roles/firewalld/tasks/main.yaml | 0 .../project/roles/firewalld/vars/Debian.yaml | 0 .../project/roles/firewalld/vars/RedHat.yaml | 0 .../ansible}/project/roles/grafana/README.rst | 0 .../project/roles/grafana/defaults/main.yml | 0 .../project/roles/grafana/handlers/main.yml | 0 .../project/roles/grafana/tasks/firewall.yml | 0 .../project/roles/grafana/tasks/main.yml | 0 .../project/roles/grafana/templates/env.j2 | 0 .../templates/grafana-renderer.service.j2 | 0 .../grafana/templates/grafana.service.j2 | 0 .../project/roles/grafana/vars/Debian.yaml | 0 .../project/roles/grafana/vars/RedHat.yaml | 0 .../project/roles/graphite/README.rst | 0 .../project/roles/graphite/defaults/main.yaml | 0 .../project/roles/graphite/handlers/main.yaml | 0 .../project/roles/graphite/tasks/firewall.yml | 0 .../project/roles/graphite/tasks/main.yaml | 0 .../roles/graphite/templates/carbon.conf.j2 | 0 .../project/roles/graphite/templates/env.j2 | 0 .../graphite/templates/go-carbon.conf.j2 | 0 .../templates/graphite-statsd.conf.j2 | 0 .../graphite/templates/graphite.service.j2 | 0 .../graphite/templates/relay-rules.conf.j2 | 0 .../roles/graphite/templates/statsd.js.j2 | 0 .../templates/storage-aggregation.conf.j2 | 0 .../templates/storage-schemas.conf.j2 | 0 .../project/roles/graphite/vars/Debian.yaml | 0 .../project/roles/graphite/vars/RedHat.yaml | 0 .../project/roles/logrotate/README.rst | 0 .../roles/logrotate/defaults/main.yaml | 0 .../project/roles/logrotate/tasks/main.yaml | 0 .../logrotate/templates/logrotate.conf.j2 | 0 .../project/roles/manage_db/tasks/main.yaml | 0 .../project/roles/manage_db/tasks/user.yaml | 0 .../roles/postgresql/defaults/main.yml | 0 .../roles/postgresql/handlers/main.yml | 0 .../roles/postgresql/tasks/firewall.yml | 0 .../project/roles/postgresql/tasks/main.yaml | 0 .../project/roles/postgresql/templates/env.j2 | 0 .../postgresql/templates/postgres.service.j2 | 0 .../project/roles/postgresql/vars/Debian.yaml | 0 .../project/roles/postgresql/vars/RedHat.yaml | 0 .../ansible}/project/roles/statsd/README.rst | 0 .../project/roles/statsd/defaults/main.yaml | 0 .../project/roles/statsd/handlers/main.yaml | 0 .../project/roles/statsd/tasks/main.yaml | 0 .../roles/statsd/templates/config.js.j2 | 0 .../roles/statsd/templates/statsd.service.j2 | 0 .../project/roles/statsd/vars/Debian.yaml | 0 .../project/roles/statsd/vars/RedHat.yaml | 0 .../ansible}/project/start_epmon.yaml | 0 .../ansible}/project/start_executors.yaml | 0 .../ansible}/project/start_schedulers.yaml | 0 .../ansible}/project/stop_epmon.yaml | 0 .../ansible}/project/stop_executors.yaml | 0 .../ansible}/project/stop_schedulers.yaml | 0 cloudmon/plugin/apimon.py | 6 ++++ cloudmon/plugin/epmon.py | 3 ++ cloudmon/runner.py | 9 +++++- cloudmon/service/grafana.py | 1 + cloudmon/service/sqldb.py | 2 ++ cloudmon/service/statsd.py | 1 + cloudmon/service/tsdb.py | 1 + cloudmon/version.py | 16 ++++++++++ setup.cfg | 13 +++++--- setup.py | 3 -- tox.ini | 17 +--------- 124 files changed, 49 insertions(+), 87 deletions(-) delete mode 100644 ansible/inventory/group_vars/all.yaml delete mode 100644 ansible/inventory/hosts delete mode 100644 ansible/inventory_quickstart/group_vars/all.yml delete mode 100644 ansible/inventory_quickstart/hosts rename {ansible => cloudmon/ansible}/project/configure_backend_members.yaml (100%) rename {ansible => cloudmon/ansible}/project/install_epmon.yaml (100%) rename {ansible => cloudmon/ansible}/project/install_executor.yaml (100%) rename {ansible => cloudmon/ansible}/project/install_grafana.yaml (100%) rename {ansible => cloudmon/ansible}/project/install_graphite.yaml (100%) rename {ansible => cloudmon/ansible}/project/install_postgresql.yaml (100%) rename {ansible => cloudmon/ansible}/project/install_scheduler.yaml (100%) rename {ansible => cloudmon/ansible}/project/install_statsd.yaml (100%) rename {ansible => cloudmon/ansible}/project/manage_databases.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/.keep (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_executor/README.md (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_executor/defaults/main.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_executor/handlers/main.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_executor/tasks/main.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_executor/templates/apimon-executor.service.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_executor/templates/env_executor (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_executor/templates/logging.conf (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_executor/tests/inventory (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_executor/tests/test.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_executor/vars/Debian.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_executor/vars/RedHat.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_executor/vars/main.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_scheduler/README.md (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_scheduler/defaults/main.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_scheduler/handlers/main.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_scheduler/tasks/firewall.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_scheduler/tasks/main.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_scheduler/templates/apimon-scheduler.service.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_scheduler/templates/env_scheduler (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_scheduler/templates/logging.conf (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_scheduler/tests/inventory (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_scheduler/tests/test.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_scheduler/vars/Debian.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_scheduler/vars/RedHat.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/apimon_scheduler/vars/main.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/epmon/README.md (100%) rename {ansible => cloudmon/ansible}/project/roles/epmon/defaults/main.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/epmon/handlers/main.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/epmon/tasks/main.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/epmon/templates/env_epmon (100%) rename {ansible => cloudmon/ansible}/project/roles/epmon/templates/epmon.service.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/epmon/templates/logging.conf (100%) rename {ansible => cloudmon/ansible}/project/roles/epmon/tests/inventory (100%) rename {ansible => cloudmon/ansible}/project/roles/epmon/tests/test.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/epmon/vars/Debian.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/epmon/vars/RedHat.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/epmon/vars/main.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/firewalld/README.rst (100%) rename {ansible => cloudmon/ansible}/project/roles/firewalld/defaults/main.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/firewalld/handlers/main.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/firewalld/tasks/main.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/firewalld/vars/Debian.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/firewalld/vars/RedHat.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/grafana/README.rst (100%) rename {ansible => cloudmon/ansible}/project/roles/grafana/defaults/main.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/grafana/handlers/main.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/grafana/tasks/firewall.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/grafana/tasks/main.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/grafana/templates/env.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/grafana/templates/grafana-renderer.service.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/grafana/templates/grafana.service.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/grafana/vars/Debian.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/grafana/vars/RedHat.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/graphite/README.rst (100%) rename {ansible => cloudmon/ansible}/project/roles/graphite/defaults/main.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/graphite/handlers/main.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/graphite/tasks/firewall.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/graphite/tasks/main.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/graphite/templates/carbon.conf.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/graphite/templates/env.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/graphite/templates/go-carbon.conf.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/graphite/templates/graphite-statsd.conf.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/graphite/templates/graphite.service.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/graphite/templates/relay-rules.conf.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/graphite/templates/statsd.js.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/graphite/templates/storage-aggregation.conf.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/graphite/templates/storage-schemas.conf.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/graphite/vars/Debian.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/graphite/vars/RedHat.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/logrotate/README.rst (100%) rename {ansible => cloudmon/ansible}/project/roles/logrotate/defaults/main.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/logrotate/tasks/main.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/logrotate/templates/logrotate.conf.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/manage_db/tasks/main.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/manage_db/tasks/user.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/postgresql/defaults/main.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/postgresql/handlers/main.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/postgresql/tasks/firewall.yml (100%) rename {ansible => cloudmon/ansible}/project/roles/postgresql/tasks/main.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/postgresql/templates/env.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/postgresql/templates/postgres.service.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/postgresql/vars/Debian.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/postgresql/vars/RedHat.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/statsd/README.rst (100%) rename {ansible => cloudmon/ansible}/project/roles/statsd/defaults/main.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/statsd/handlers/main.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/statsd/tasks/main.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/statsd/templates/config.js.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/statsd/templates/statsd.service.j2 (100%) rename {ansible => cloudmon/ansible}/project/roles/statsd/vars/Debian.yaml (100%) rename {ansible => cloudmon/ansible}/project/roles/statsd/vars/RedHat.yaml (100%) rename {ansible => cloudmon/ansible}/project/start_epmon.yaml (100%) rename {ansible => cloudmon/ansible}/project/start_executors.yaml (100%) rename {ansible => cloudmon/ansible}/project/start_schedulers.yaml (100%) rename {ansible => cloudmon/ansible}/project/stop_epmon.yaml (100%) rename {ansible => cloudmon/ansible}/project/stop_executors.yaml (100%) rename {ansible => cloudmon/ansible}/project/stop_schedulers.yaml (100%) create mode 100644 cloudmon/version.py diff --git a/.gitignore b/.gitignore index 5386385..1923863 100644 --- a/.gitignore +++ b/.gitignore @@ -62,6 +62,7 @@ releasenotes/build # CloudMon specifics **/artifacts +.cloudmon_artifact ansible/env config.yaml git_repos diff --git a/ansible/inventory/group_vars/all.yaml b/ansible/inventory/group_vars/all.yaml deleted file mode 100644 index 94bc6e2..0000000 --- a/ansible/inventory/group_vars/all.yaml +++ /dev/null @@ -1 +0,0 @@ -graphite_host: localhost diff --git a/ansible/inventory/hosts b/ansible/inventory/hosts deleted file mode 100644 index 26001b2..0000000 --- a/ansible/inventory/hosts +++ /dev/null @@ -1,11 +0,0 @@ ---- -all: - hosts: - localhost - children: - schedulers: - hosts: - localhost - executors: - hosts: - localhost diff --git a/ansible/inventory_quickstart/group_vars/all.yml b/ansible/inventory_quickstart/group_vars/all.yml deleted file mode 100644 index 8d12939..0000000 --- a/ansible/inventory_quickstart/group_vars/all.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# Place your values here diff --git a/ansible/inventory_quickstart/hosts b/ansible/inventory_quickstart/hosts deleted file mode 100644 index 7b784d3..0000000 --- a/ansible/inventory_quickstart/hosts +++ /dev/null @@ -1,31 +0,0 @@ -all: - hosts: - # Replace with your host IP address - #server1: - # ansible_host: A.B.C.D - # ansible_user: ubuntu - # Since components want to talk to each other using internal network - - # define this - # internal_address: 192.168.0.2 - children: - statsd: - hosts: - worker - graphite: - hosts: - worker - grafana: - hosts: - worker - schedulers: - hosts: - worker - executors: - hosts: - worker - epmons: - hosts: - worker - postgres: - hosts: - worker diff --git a/cloudmon/__init__.py b/cloudmon/__init__.py index b1bfbd6..e69de29 100644 --- a/cloudmon/__init__.py +++ b/cloudmon/__init__.py @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- - -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import pbr.version - - -__version__ = pbr.version.VersionInfo("cloudmon").version_string() diff --git a/ansible/project/configure_backend_members.yaml b/cloudmon/ansible/project/configure_backend_members.yaml similarity index 100% rename from ansible/project/configure_backend_members.yaml rename to cloudmon/ansible/project/configure_backend_members.yaml diff --git a/ansible/project/install_epmon.yaml b/cloudmon/ansible/project/install_epmon.yaml similarity index 100% rename from ansible/project/install_epmon.yaml rename to cloudmon/ansible/project/install_epmon.yaml diff --git a/ansible/project/install_executor.yaml b/cloudmon/ansible/project/install_executor.yaml similarity index 100% rename from ansible/project/install_executor.yaml rename to cloudmon/ansible/project/install_executor.yaml diff --git a/ansible/project/install_grafana.yaml b/cloudmon/ansible/project/install_grafana.yaml similarity index 100% rename from ansible/project/install_grafana.yaml rename to cloudmon/ansible/project/install_grafana.yaml diff --git a/ansible/project/install_graphite.yaml b/cloudmon/ansible/project/install_graphite.yaml similarity index 100% rename from ansible/project/install_graphite.yaml rename to cloudmon/ansible/project/install_graphite.yaml diff --git a/ansible/project/install_postgresql.yaml b/cloudmon/ansible/project/install_postgresql.yaml similarity index 100% rename from ansible/project/install_postgresql.yaml rename to cloudmon/ansible/project/install_postgresql.yaml diff --git a/ansible/project/install_scheduler.yaml b/cloudmon/ansible/project/install_scheduler.yaml similarity index 100% rename from ansible/project/install_scheduler.yaml rename to cloudmon/ansible/project/install_scheduler.yaml diff --git a/ansible/project/install_statsd.yaml b/cloudmon/ansible/project/install_statsd.yaml similarity index 100% rename from ansible/project/install_statsd.yaml rename to cloudmon/ansible/project/install_statsd.yaml diff --git a/ansible/project/manage_databases.yaml b/cloudmon/ansible/project/manage_databases.yaml similarity index 100% rename from ansible/project/manage_databases.yaml rename to cloudmon/ansible/project/manage_databases.yaml diff --git a/ansible/project/roles/.keep b/cloudmon/ansible/project/roles/.keep similarity index 100% rename from ansible/project/roles/.keep rename to cloudmon/ansible/project/roles/.keep diff --git a/ansible/project/roles/apimon_executor/README.md b/cloudmon/ansible/project/roles/apimon_executor/README.md similarity index 100% rename from ansible/project/roles/apimon_executor/README.md rename to cloudmon/ansible/project/roles/apimon_executor/README.md diff --git a/ansible/project/roles/apimon_executor/defaults/main.yml b/cloudmon/ansible/project/roles/apimon_executor/defaults/main.yml similarity index 100% rename from ansible/project/roles/apimon_executor/defaults/main.yml rename to cloudmon/ansible/project/roles/apimon_executor/defaults/main.yml diff --git a/ansible/project/roles/apimon_executor/handlers/main.yml b/cloudmon/ansible/project/roles/apimon_executor/handlers/main.yml similarity index 100% rename from ansible/project/roles/apimon_executor/handlers/main.yml rename to cloudmon/ansible/project/roles/apimon_executor/handlers/main.yml diff --git a/ansible/project/roles/apimon_executor/tasks/main.yml b/cloudmon/ansible/project/roles/apimon_executor/tasks/main.yml similarity index 100% rename from ansible/project/roles/apimon_executor/tasks/main.yml rename to cloudmon/ansible/project/roles/apimon_executor/tasks/main.yml diff --git a/ansible/project/roles/apimon_executor/templates/apimon-executor.service.j2 b/cloudmon/ansible/project/roles/apimon_executor/templates/apimon-executor.service.j2 similarity index 100% rename from ansible/project/roles/apimon_executor/templates/apimon-executor.service.j2 rename to cloudmon/ansible/project/roles/apimon_executor/templates/apimon-executor.service.j2 diff --git a/ansible/project/roles/apimon_executor/templates/env_executor b/cloudmon/ansible/project/roles/apimon_executor/templates/env_executor similarity index 100% rename from ansible/project/roles/apimon_executor/templates/env_executor rename to cloudmon/ansible/project/roles/apimon_executor/templates/env_executor diff --git a/ansible/project/roles/apimon_executor/templates/logging.conf b/cloudmon/ansible/project/roles/apimon_executor/templates/logging.conf similarity index 100% rename from ansible/project/roles/apimon_executor/templates/logging.conf rename to cloudmon/ansible/project/roles/apimon_executor/templates/logging.conf diff --git a/ansible/project/roles/apimon_executor/tests/inventory b/cloudmon/ansible/project/roles/apimon_executor/tests/inventory similarity index 100% rename from ansible/project/roles/apimon_executor/tests/inventory rename to cloudmon/ansible/project/roles/apimon_executor/tests/inventory diff --git a/ansible/project/roles/apimon_executor/tests/test.yml b/cloudmon/ansible/project/roles/apimon_executor/tests/test.yml similarity index 100% rename from ansible/project/roles/apimon_executor/tests/test.yml rename to cloudmon/ansible/project/roles/apimon_executor/tests/test.yml diff --git a/ansible/project/roles/apimon_executor/vars/Debian.yaml b/cloudmon/ansible/project/roles/apimon_executor/vars/Debian.yaml similarity index 100% rename from ansible/project/roles/apimon_executor/vars/Debian.yaml rename to cloudmon/ansible/project/roles/apimon_executor/vars/Debian.yaml diff --git a/ansible/project/roles/apimon_executor/vars/RedHat.yaml b/cloudmon/ansible/project/roles/apimon_executor/vars/RedHat.yaml similarity index 100% rename from ansible/project/roles/apimon_executor/vars/RedHat.yaml rename to cloudmon/ansible/project/roles/apimon_executor/vars/RedHat.yaml diff --git a/ansible/project/roles/apimon_executor/vars/main.yaml b/cloudmon/ansible/project/roles/apimon_executor/vars/main.yaml similarity index 100% rename from ansible/project/roles/apimon_executor/vars/main.yaml rename to cloudmon/ansible/project/roles/apimon_executor/vars/main.yaml diff --git a/ansible/project/roles/apimon_scheduler/README.md b/cloudmon/ansible/project/roles/apimon_scheduler/README.md similarity index 100% rename from ansible/project/roles/apimon_scheduler/README.md rename to cloudmon/ansible/project/roles/apimon_scheduler/README.md diff --git a/ansible/project/roles/apimon_scheduler/defaults/main.yml b/cloudmon/ansible/project/roles/apimon_scheduler/defaults/main.yml similarity index 100% rename from ansible/project/roles/apimon_scheduler/defaults/main.yml rename to cloudmon/ansible/project/roles/apimon_scheduler/defaults/main.yml diff --git a/ansible/project/roles/apimon_scheduler/handlers/main.yml b/cloudmon/ansible/project/roles/apimon_scheduler/handlers/main.yml similarity index 100% rename from ansible/project/roles/apimon_scheduler/handlers/main.yml rename to cloudmon/ansible/project/roles/apimon_scheduler/handlers/main.yml diff --git a/ansible/project/roles/apimon_scheduler/tasks/firewall.yml b/cloudmon/ansible/project/roles/apimon_scheduler/tasks/firewall.yml similarity index 100% rename from ansible/project/roles/apimon_scheduler/tasks/firewall.yml rename to cloudmon/ansible/project/roles/apimon_scheduler/tasks/firewall.yml diff --git a/ansible/project/roles/apimon_scheduler/tasks/main.yml b/cloudmon/ansible/project/roles/apimon_scheduler/tasks/main.yml similarity index 100% rename from ansible/project/roles/apimon_scheduler/tasks/main.yml rename to cloudmon/ansible/project/roles/apimon_scheduler/tasks/main.yml diff --git a/ansible/project/roles/apimon_scheduler/templates/apimon-scheduler.service.j2 b/cloudmon/ansible/project/roles/apimon_scheduler/templates/apimon-scheduler.service.j2 similarity index 100% rename from ansible/project/roles/apimon_scheduler/templates/apimon-scheduler.service.j2 rename to cloudmon/ansible/project/roles/apimon_scheduler/templates/apimon-scheduler.service.j2 diff --git a/ansible/project/roles/apimon_scheduler/templates/env_scheduler b/cloudmon/ansible/project/roles/apimon_scheduler/templates/env_scheduler similarity index 100% rename from ansible/project/roles/apimon_scheduler/templates/env_scheduler rename to cloudmon/ansible/project/roles/apimon_scheduler/templates/env_scheduler diff --git a/ansible/project/roles/apimon_scheduler/templates/logging.conf b/cloudmon/ansible/project/roles/apimon_scheduler/templates/logging.conf similarity index 100% rename from ansible/project/roles/apimon_scheduler/templates/logging.conf rename to cloudmon/ansible/project/roles/apimon_scheduler/templates/logging.conf diff --git a/ansible/project/roles/apimon_scheduler/tests/inventory b/cloudmon/ansible/project/roles/apimon_scheduler/tests/inventory similarity index 100% rename from ansible/project/roles/apimon_scheduler/tests/inventory rename to cloudmon/ansible/project/roles/apimon_scheduler/tests/inventory diff --git a/ansible/project/roles/apimon_scheduler/tests/test.yml b/cloudmon/ansible/project/roles/apimon_scheduler/tests/test.yml similarity index 100% rename from ansible/project/roles/apimon_scheduler/tests/test.yml rename to cloudmon/ansible/project/roles/apimon_scheduler/tests/test.yml diff --git a/ansible/project/roles/apimon_scheduler/vars/Debian.yaml b/cloudmon/ansible/project/roles/apimon_scheduler/vars/Debian.yaml similarity index 100% rename from ansible/project/roles/apimon_scheduler/vars/Debian.yaml rename to cloudmon/ansible/project/roles/apimon_scheduler/vars/Debian.yaml diff --git a/ansible/project/roles/apimon_scheduler/vars/RedHat.yaml b/cloudmon/ansible/project/roles/apimon_scheduler/vars/RedHat.yaml similarity index 100% rename from ansible/project/roles/apimon_scheduler/vars/RedHat.yaml rename to cloudmon/ansible/project/roles/apimon_scheduler/vars/RedHat.yaml diff --git a/ansible/project/roles/apimon_scheduler/vars/main.yaml b/cloudmon/ansible/project/roles/apimon_scheduler/vars/main.yaml similarity index 100% rename from ansible/project/roles/apimon_scheduler/vars/main.yaml rename to cloudmon/ansible/project/roles/apimon_scheduler/vars/main.yaml diff --git a/ansible/project/roles/epmon/README.md b/cloudmon/ansible/project/roles/epmon/README.md similarity index 100% rename from ansible/project/roles/epmon/README.md rename to cloudmon/ansible/project/roles/epmon/README.md diff --git a/ansible/project/roles/epmon/defaults/main.yml b/cloudmon/ansible/project/roles/epmon/defaults/main.yml similarity index 100% rename from ansible/project/roles/epmon/defaults/main.yml rename to cloudmon/ansible/project/roles/epmon/defaults/main.yml diff --git a/ansible/project/roles/epmon/handlers/main.yml b/cloudmon/ansible/project/roles/epmon/handlers/main.yml similarity index 100% rename from ansible/project/roles/epmon/handlers/main.yml rename to cloudmon/ansible/project/roles/epmon/handlers/main.yml diff --git a/ansible/project/roles/epmon/tasks/main.yml b/cloudmon/ansible/project/roles/epmon/tasks/main.yml similarity index 100% rename from ansible/project/roles/epmon/tasks/main.yml rename to cloudmon/ansible/project/roles/epmon/tasks/main.yml diff --git a/ansible/project/roles/epmon/templates/env_epmon b/cloudmon/ansible/project/roles/epmon/templates/env_epmon similarity index 100% rename from ansible/project/roles/epmon/templates/env_epmon rename to cloudmon/ansible/project/roles/epmon/templates/env_epmon diff --git a/ansible/project/roles/epmon/templates/epmon.service.j2 b/cloudmon/ansible/project/roles/epmon/templates/epmon.service.j2 similarity index 100% rename from ansible/project/roles/epmon/templates/epmon.service.j2 rename to cloudmon/ansible/project/roles/epmon/templates/epmon.service.j2 diff --git a/ansible/project/roles/epmon/templates/logging.conf b/cloudmon/ansible/project/roles/epmon/templates/logging.conf similarity index 100% rename from ansible/project/roles/epmon/templates/logging.conf rename to cloudmon/ansible/project/roles/epmon/templates/logging.conf diff --git a/ansible/project/roles/epmon/tests/inventory b/cloudmon/ansible/project/roles/epmon/tests/inventory similarity index 100% rename from ansible/project/roles/epmon/tests/inventory rename to cloudmon/ansible/project/roles/epmon/tests/inventory diff --git a/ansible/project/roles/epmon/tests/test.yml b/cloudmon/ansible/project/roles/epmon/tests/test.yml similarity index 100% rename from ansible/project/roles/epmon/tests/test.yml rename to cloudmon/ansible/project/roles/epmon/tests/test.yml diff --git a/ansible/project/roles/epmon/vars/Debian.yaml b/cloudmon/ansible/project/roles/epmon/vars/Debian.yaml similarity index 100% rename from ansible/project/roles/epmon/vars/Debian.yaml rename to cloudmon/ansible/project/roles/epmon/vars/Debian.yaml diff --git a/ansible/project/roles/epmon/vars/RedHat.yaml b/cloudmon/ansible/project/roles/epmon/vars/RedHat.yaml similarity index 100% rename from ansible/project/roles/epmon/vars/RedHat.yaml rename to cloudmon/ansible/project/roles/epmon/vars/RedHat.yaml diff --git a/ansible/project/roles/epmon/vars/main.yaml b/cloudmon/ansible/project/roles/epmon/vars/main.yaml similarity index 100% rename from ansible/project/roles/epmon/vars/main.yaml rename to cloudmon/ansible/project/roles/epmon/vars/main.yaml diff --git a/ansible/project/roles/firewalld/README.rst b/cloudmon/ansible/project/roles/firewalld/README.rst similarity index 100% rename from ansible/project/roles/firewalld/README.rst rename to cloudmon/ansible/project/roles/firewalld/README.rst diff --git a/ansible/project/roles/firewalld/defaults/main.yaml b/cloudmon/ansible/project/roles/firewalld/defaults/main.yaml similarity index 100% rename from ansible/project/roles/firewalld/defaults/main.yaml rename to cloudmon/ansible/project/roles/firewalld/defaults/main.yaml diff --git a/ansible/project/roles/firewalld/handlers/main.yaml b/cloudmon/ansible/project/roles/firewalld/handlers/main.yaml similarity index 100% rename from ansible/project/roles/firewalld/handlers/main.yaml rename to cloudmon/ansible/project/roles/firewalld/handlers/main.yaml diff --git a/ansible/project/roles/firewalld/tasks/main.yaml b/cloudmon/ansible/project/roles/firewalld/tasks/main.yaml similarity index 100% rename from ansible/project/roles/firewalld/tasks/main.yaml rename to cloudmon/ansible/project/roles/firewalld/tasks/main.yaml diff --git a/ansible/project/roles/firewalld/vars/Debian.yaml b/cloudmon/ansible/project/roles/firewalld/vars/Debian.yaml similarity index 100% rename from ansible/project/roles/firewalld/vars/Debian.yaml rename to cloudmon/ansible/project/roles/firewalld/vars/Debian.yaml diff --git a/ansible/project/roles/firewalld/vars/RedHat.yaml b/cloudmon/ansible/project/roles/firewalld/vars/RedHat.yaml similarity index 100% rename from ansible/project/roles/firewalld/vars/RedHat.yaml rename to cloudmon/ansible/project/roles/firewalld/vars/RedHat.yaml diff --git a/ansible/project/roles/grafana/README.rst b/cloudmon/ansible/project/roles/grafana/README.rst similarity index 100% rename from ansible/project/roles/grafana/README.rst rename to cloudmon/ansible/project/roles/grafana/README.rst diff --git a/ansible/project/roles/grafana/defaults/main.yml b/cloudmon/ansible/project/roles/grafana/defaults/main.yml similarity index 100% rename from ansible/project/roles/grafana/defaults/main.yml rename to cloudmon/ansible/project/roles/grafana/defaults/main.yml diff --git a/ansible/project/roles/grafana/handlers/main.yml b/cloudmon/ansible/project/roles/grafana/handlers/main.yml similarity index 100% rename from ansible/project/roles/grafana/handlers/main.yml rename to cloudmon/ansible/project/roles/grafana/handlers/main.yml diff --git a/ansible/project/roles/grafana/tasks/firewall.yml b/cloudmon/ansible/project/roles/grafana/tasks/firewall.yml similarity index 100% rename from ansible/project/roles/grafana/tasks/firewall.yml rename to cloudmon/ansible/project/roles/grafana/tasks/firewall.yml diff --git a/ansible/project/roles/grafana/tasks/main.yml b/cloudmon/ansible/project/roles/grafana/tasks/main.yml similarity index 100% rename from ansible/project/roles/grafana/tasks/main.yml rename to cloudmon/ansible/project/roles/grafana/tasks/main.yml diff --git a/ansible/project/roles/grafana/templates/env.j2 b/cloudmon/ansible/project/roles/grafana/templates/env.j2 similarity index 100% rename from ansible/project/roles/grafana/templates/env.j2 rename to cloudmon/ansible/project/roles/grafana/templates/env.j2 diff --git a/ansible/project/roles/grafana/templates/grafana-renderer.service.j2 b/cloudmon/ansible/project/roles/grafana/templates/grafana-renderer.service.j2 similarity index 100% rename from ansible/project/roles/grafana/templates/grafana-renderer.service.j2 rename to cloudmon/ansible/project/roles/grafana/templates/grafana-renderer.service.j2 diff --git a/ansible/project/roles/grafana/templates/grafana.service.j2 b/cloudmon/ansible/project/roles/grafana/templates/grafana.service.j2 similarity index 100% rename from ansible/project/roles/grafana/templates/grafana.service.j2 rename to cloudmon/ansible/project/roles/grafana/templates/grafana.service.j2 diff --git a/ansible/project/roles/grafana/vars/Debian.yaml b/cloudmon/ansible/project/roles/grafana/vars/Debian.yaml similarity index 100% rename from ansible/project/roles/grafana/vars/Debian.yaml rename to cloudmon/ansible/project/roles/grafana/vars/Debian.yaml diff --git a/ansible/project/roles/grafana/vars/RedHat.yaml b/cloudmon/ansible/project/roles/grafana/vars/RedHat.yaml similarity index 100% rename from ansible/project/roles/grafana/vars/RedHat.yaml rename to cloudmon/ansible/project/roles/grafana/vars/RedHat.yaml diff --git a/ansible/project/roles/graphite/README.rst b/cloudmon/ansible/project/roles/graphite/README.rst similarity index 100% rename from ansible/project/roles/graphite/README.rst rename to cloudmon/ansible/project/roles/graphite/README.rst diff --git a/ansible/project/roles/graphite/defaults/main.yaml b/cloudmon/ansible/project/roles/graphite/defaults/main.yaml similarity index 100% rename from ansible/project/roles/graphite/defaults/main.yaml rename to cloudmon/ansible/project/roles/graphite/defaults/main.yaml diff --git a/ansible/project/roles/graphite/handlers/main.yaml b/cloudmon/ansible/project/roles/graphite/handlers/main.yaml similarity index 100% rename from ansible/project/roles/graphite/handlers/main.yaml rename to cloudmon/ansible/project/roles/graphite/handlers/main.yaml diff --git a/ansible/project/roles/graphite/tasks/firewall.yml b/cloudmon/ansible/project/roles/graphite/tasks/firewall.yml similarity index 100% rename from ansible/project/roles/graphite/tasks/firewall.yml rename to cloudmon/ansible/project/roles/graphite/tasks/firewall.yml diff --git a/ansible/project/roles/graphite/tasks/main.yaml b/cloudmon/ansible/project/roles/graphite/tasks/main.yaml similarity index 100% rename from ansible/project/roles/graphite/tasks/main.yaml rename to cloudmon/ansible/project/roles/graphite/tasks/main.yaml diff --git a/ansible/project/roles/graphite/templates/carbon.conf.j2 b/cloudmon/ansible/project/roles/graphite/templates/carbon.conf.j2 similarity index 100% rename from ansible/project/roles/graphite/templates/carbon.conf.j2 rename to cloudmon/ansible/project/roles/graphite/templates/carbon.conf.j2 diff --git a/ansible/project/roles/graphite/templates/env.j2 b/cloudmon/ansible/project/roles/graphite/templates/env.j2 similarity index 100% rename from ansible/project/roles/graphite/templates/env.j2 rename to cloudmon/ansible/project/roles/graphite/templates/env.j2 diff --git a/ansible/project/roles/graphite/templates/go-carbon.conf.j2 b/cloudmon/ansible/project/roles/graphite/templates/go-carbon.conf.j2 similarity index 100% rename from ansible/project/roles/graphite/templates/go-carbon.conf.j2 rename to cloudmon/ansible/project/roles/graphite/templates/go-carbon.conf.j2 diff --git a/ansible/project/roles/graphite/templates/graphite-statsd.conf.j2 b/cloudmon/ansible/project/roles/graphite/templates/graphite-statsd.conf.j2 similarity index 100% rename from ansible/project/roles/graphite/templates/graphite-statsd.conf.j2 rename to cloudmon/ansible/project/roles/graphite/templates/graphite-statsd.conf.j2 diff --git a/ansible/project/roles/graphite/templates/graphite.service.j2 b/cloudmon/ansible/project/roles/graphite/templates/graphite.service.j2 similarity index 100% rename from ansible/project/roles/graphite/templates/graphite.service.j2 rename to cloudmon/ansible/project/roles/graphite/templates/graphite.service.j2 diff --git a/ansible/project/roles/graphite/templates/relay-rules.conf.j2 b/cloudmon/ansible/project/roles/graphite/templates/relay-rules.conf.j2 similarity index 100% rename from ansible/project/roles/graphite/templates/relay-rules.conf.j2 rename to cloudmon/ansible/project/roles/graphite/templates/relay-rules.conf.j2 diff --git a/ansible/project/roles/graphite/templates/statsd.js.j2 b/cloudmon/ansible/project/roles/graphite/templates/statsd.js.j2 similarity index 100% rename from ansible/project/roles/graphite/templates/statsd.js.j2 rename to cloudmon/ansible/project/roles/graphite/templates/statsd.js.j2 diff --git a/ansible/project/roles/graphite/templates/storage-aggregation.conf.j2 b/cloudmon/ansible/project/roles/graphite/templates/storage-aggregation.conf.j2 similarity index 100% rename from ansible/project/roles/graphite/templates/storage-aggregation.conf.j2 rename to cloudmon/ansible/project/roles/graphite/templates/storage-aggregation.conf.j2 diff --git a/ansible/project/roles/graphite/templates/storage-schemas.conf.j2 b/cloudmon/ansible/project/roles/graphite/templates/storage-schemas.conf.j2 similarity index 100% rename from ansible/project/roles/graphite/templates/storage-schemas.conf.j2 rename to cloudmon/ansible/project/roles/graphite/templates/storage-schemas.conf.j2 diff --git a/ansible/project/roles/graphite/vars/Debian.yaml b/cloudmon/ansible/project/roles/graphite/vars/Debian.yaml similarity index 100% rename from ansible/project/roles/graphite/vars/Debian.yaml rename to cloudmon/ansible/project/roles/graphite/vars/Debian.yaml diff --git a/ansible/project/roles/graphite/vars/RedHat.yaml b/cloudmon/ansible/project/roles/graphite/vars/RedHat.yaml similarity index 100% rename from ansible/project/roles/graphite/vars/RedHat.yaml rename to cloudmon/ansible/project/roles/graphite/vars/RedHat.yaml diff --git a/ansible/project/roles/logrotate/README.rst b/cloudmon/ansible/project/roles/logrotate/README.rst similarity index 100% rename from ansible/project/roles/logrotate/README.rst rename to cloudmon/ansible/project/roles/logrotate/README.rst diff --git a/ansible/project/roles/logrotate/defaults/main.yaml b/cloudmon/ansible/project/roles/logrotate/defaults/main.yaml similarity index 100% rename from ansible/project/roles/logrotate/defaults/main.yaml rename to cloudmon/ansible/project/roles/logrotate/defaults/main.yaml diff --git a/ansible/project/roles/logrotate/tasks/main.yaml b/cloudmon/ansible/project/roles/logrotate/tasks/main.yaml similarity index 100% rename from ansible/project/roles/logrotate/tasks/main.yaml rename to cloudmon/ansible/project/roles/logrotate/tasks/main.yaml diff --git a/ansible/project/roles/logrotate/templates/logrotate.conf.j2 b/cloudmon/ansible/project/roles/logrotate/templates/logrotate.conf.j2 similarity index 100% rename from ansible/project/roles/logrotate/templates/logrotate.conf.j2 rename to cloudmon/ansible/project/roles/logrotate/templates/logrotate.conf.j2 diff --git a/ansible/project/roles/manage_db/tasks/main.yaml b/cloudmon/ansible/project/roles/manage_db/tasks/main.yaml similarity index 100% rename from ansible/project/roles/manage_db/tasks/main.yaml rename to cloudmon/ansible/project/roles/manage_db/tasks/main.yaml diff --git a/ansible/project/roles/manage_db/tasks/user.yaml b/cloudmon/ansible/project/roles/manage_db/tasks/user.yaml similarity index 100% rename from ansible/project/roles/manage_db/tasks/user.yaml rename to cloudmon/ansible/project/roles/manage_db/tasks/user.yaml diff --git a/ansible/project/roles/postgresql/defaults/main.yml b/cloudmon/ansible/project/roles/postgresql/defaults/main.yml similarity index 100% rename from ansible/project/roles/postgresql/defaults/main.yml rename to cloudmon/ansible/project/roles/postgresql/defaults/main.yml diff --git a/ansible/project/roles/postgresql/handlers/main.yml b/cloudmon/ansible/project/roles/postgresql/handlers/main.yml similarity index 100% rename from ansible/project/roles/postgresql/handlers/main.yml rename to cloudmon/ansible/project/roles/postgresql/handlers/main.yml diff --git a/ansible/project/roles/postgresql/tasks/firewall.yml b/cloudmon/ansible/project/roles/postgresql/tasks/firewall.yml similarity index 100% rename from ansible/project/roles/postgresql/tasks/firewall.yml rename to cloudmon/ansible/project/roles/postgresql/tasks/firewall.yml diff --git a/ansible/project/roles/postgresql/tasks/main.yaml b/cloudmon/ansible/project/roles/postgresql/tasks/main.yaml similarity index 100% rename from ansible/project/roles/postgresql/tasks/main.yaml rename to cloudmon/ansible/project/roles/postgresql/tasks/main.yaml diff --git a/ansible/project/roles/postgresql/templates/env.j2 b/cloudmon/ansible/project/roles/postgresql/templates/env.j2 similarity index 100% rename from ansible/project/roles/postgresql/templates/env.j2 rename to cloudmon/ansible/project/roles/postgresql/templates/env.j2 diff --git a/ansible/project/roles/postgresql/templates/postgres.service.j2 b/cloudmon/ansible/project/roles/postgresql/templates/postgres.service.j2 similarity index 100% rename from ansible/project/roles/postgresql/templates/postgres.service.j2 rename to cloudmon/ansible/project/roles/postgresql/templates/postgres.service.j2 diff --git a/ansible/project/roles/postgresql/vars/Debian.yaml b/cloudmon/ansible/project/roles/postgresql/vars/Debian.yaml similarity index 100% rename from ansible/project/roles/postgresql/vars/Debian.yaml rename to cloudmon/ansible/project/roles/postgresql/vars/Debian.yaml diff --git a/ansible/project/roles/postgresql/vars/RedHat.yaml b/cloudmon/ansible/project/roles/postgresql/vars/RedHat.yaml similarity index 100% rename from ansible/project/roles/postgresql/vars/RedHat.yaml rename to cloudmon/ansible/project/roles/postgresql/vars/RedHat.yaml diff --git a/ansible/project/roles/statsd/README.rst b/cloudmon/ansible/project/roles/statsd/README.rst similarity index 100% rename from ansible/project/roles/statsd/README.rst rename to cloudmon/ansible/project/roles/statsd/README.rst diff --git a/ansible/project/roles/statsd/defaults/main.yaml b/cloudmon/ansible/project/roles/statsd/defaults/main.yaml similarity index 100% rename from ansible/project/roles/statsd/defaults/main.yaml rename to cloudmon/ansible/project/roles/statsd/defaults/main.yaml diff --git a/ansible/project/roles/statsd/handlers/main.yaml b/cloudmon/ansible/project/roles/statsd/handlers/main.yaml similarity index 100% rename from ansible/project/roles/statsd/handlers/main.yaml rename to cloudmon/ansible/project/roles/statsd/handlers/main.yaml diff --git a/ansible/project/roles/statsd/tasks/main.yaml b/cloudmon/ansible/project/roles/statsd/tasks/main.yaml similarity index 100% rename from ansible/project/roles/statsd/tasks/main.yaml rename to cloudmon/ansible/project/roles/statsd/tasks/main.yaml diff --git a/ansible/project/roles/statsd/templates/config.js.j2 b/cloudmon/ansible/project/roles/statsd/templates/config.js.j2 similarity index 100% rename from ansible/project/roles/statsd/templates/config.js.j2 rename to cloudmon/ansible/project/roles/statsd/templates/config.js.j2 diff --git a/ansible/project/roles/statsd/templates/statsd.service.j2 b/cloudmon/ansible/project/roles/statsd/templates/statsd.service.j2 similarity index 100% rename from ansible/project/roles/statsd/templates/statsd.service.j2 rename to cloudmon/ansible/project/roles/statsd/templates/statsd.service.j2 diff --git a/ansible/project/roles/statsd/vars/Debian.yaml b/cloudmon/ansible/project/roles/statsd/vars/Debian.yaml similarity index 100% rename from ansible/project/roles/statsd/vars/Debian.yaml rename to cloudmon/ansible/project/roles/statsd/vars/Debian.yaml diff --git a/ansible/project/roles/statsd/vars/RedHat.yaml b/cloudmon/ansible/project/roles/statsd/vars/RedHat.yaml similarity index 100% rename from ansible/project/roles/statsd/vars/RedHat.yaml rename to cloudmon/ansible/project/roles/statsd/vars/RedHat.yaml diff --git a/ansible/project/start_epmon.yaml b/cloudmon/ansible/project/start_epmon.yaml similarity index 100% rename from ansible/project/start_epmon.yaml rename to cloudmon/ansible/project/start_epmon.yaml diff --git a/ansible/project/start_executors.yaml b/cloudmon/ansible/project/start_executors.yaml similarity index 100% rename from ansible/project/start_executors.yaml rename to cloudmon/ansible/project/start_executors.yaml diff --git a/ansible/project/start_schedulers.yaml b/cloudmon/ansible/project/start_schedulers.yaml similarity index 100% rename from ansible/project/start_schedulers.yaml rename to cloudmon/ansible/project/start_schedulers.yaml diff --git a/ansible/project/stop_epmon.yaml b/cloudmon/ansible/project/stop_epmon.yaml similarity index 100% rename from ansible/project/stop_epmon.yaml rename to cloudmon/ansible/project/stop_epmon.yaml diff --git a/ansible/project/stop_executors.yaml b/cloudmon/ansible/project/stop_executors.yaml similarity index 100% rename from ansible/project/stop_executors.yaml rename to cloudmon/ansible/project/stop_executors.yaml diff --git a/ansible/project/stop_schedulers.yaml b/cloudmon/ansible/project/stop_schedulers.yaml similarity index 100% rename from ansible/project/stop_schedulers.yaml rename to cloudmon/ansible/project/stop_schedulers.yaml diff --git a/cloudmon/plugin/apimon.py b/cloudmon/plugin/apimon.py index 98f80c7..aef3397 100644 --- a/cloudmon/plugin/apimon.py +++ b/cloudmon/plugin/apimon.py @@ -256,6 +256,7 @@ def provision_schedulers(self, check): r = ansible_runner.run( private_data_dir=self.config.private_data_dir, + artifact_dir=".cloudmon_artifact", playbook="install_scheduler.yaml", inventory=self.config.inventory_path, extravars=extravars, @@ -306,6 +307,7 @@ def provision_executors(self, check): r = ansible_runner.run( private_data_dir=self.config.private_data_dir, + artifact_dir=".cloudmon_artifact", playbook="install_executor.yaml", inventory=self.config.inventory_path, extravars=extravars, @@ -345,6 +347,7 @@ def stop_schedulers(self, apimon_config, check): ) r = ansible_runner.run( private_data_dir=self.config.private_data_dir, + artifact_dir=".cloudmon_artifact", playbook="stop_schedulers.yaml", inventory=self.config.inventory_path, extravars=extravars, @@ -364,6 +367,7 @@ def stop_executors(self, apimon_config, check): ) r = ansible_runner.run( private_data_dir=self.config.private_data_dir, + artifact_dir=".cloudmon_artifact", playbook="stop_executors.yaml", inventory=self.config.inventory_path, extravars=extravars, @@ -383,6 +387,7 @@ def start_schedulers(self, apimon_config, check): ) r = ansible_runner.run( private_data_dir=self.config.private_data_dir, + artifact_dir=".cloudmon_artifact", playbook="start_schedulers.yaml", inventory=self.config.inventory_path, extravars=extravars, @@ -402,6 +407,7 @@ def start_executors(self, apimon_config, check): ) r = ansible_runner.run( private_data_dir=self.config.private_data_dir, + artifact_dir=".cloudmon_artifact", playbook="start_executors.yaml", inventory=self.config.inventory_path, extravars=extravars, diff --git a/cloudmon/plugin/epmon.py b/cloudmon/plugin/epmon.py index 470cb10..62af3ce 100644 --- a/cloudmon/plugin/epmon.py +++ b/cloudmon/plugin/epmon.py @@ -158,6 +158,7 @@ def provision(self, check): ) r = ansible_runner.run( private_data_dir=self.config.private_data_dir, + artifact_dir=".cloudmon_artifact", playbook="install_epmon.yaml", inventory=self.config.inventory_path, extravars=extravars, @@ -178,6 +179,7 @@ def stop(self, check=False): ) r = ansible_runner.run( private_data_dir=self.config.private_data_dir, + artifact_dir=".cloudmon_artifact", playbook="stop_epmon.yaml", inventory=self.config.inventory_path, extravars=extravars, @@ -198,6 +200,7 @@ def start(self, check=False): ) r = ansible_runner.run( private_data_dir=self.config.private_data_dir, + artifact_dir=".cloudmon_artifact", playbook="start_epmon.yaml", inventory=self.config.inventory_path, extravars=extravars, diff --git a/cloudmon/runner.py b/cloudmon/runner.py index 736966d..464d3b5 100644 --- a/cloudmon/runner.py +++ b/cloudmon/runner.py @@ -12,7 +12,9 @@ # limitations under the License. import argparse +import importlib.resources import logging +import pathlib import sys import ansible_runner @@ -218,7 +220,9 @@ def create_parser(self): parser.add_argument( "--private-data-dir", dest="private_data_dir", - default="ansible", + default=pathlib.Path( + importlib.resources.files("cloudmon"), + "ansible"), help="Ansible-runner project dir", ) parser.add_argument( @@ -264,6 +268,9 @@ def main(self): with open(self.args.config, "r") as f: self.config = yaml.load(f) + self.args.inventory = pathlib.Path( + self.args.inventory).resolve().as_posix() + out, err = ansible_runner.get_inventory( action="list", inventories=[self.args.inventory], diff --git a/cloudmon/service/grafana.py b/cloudmon/service/grafana.py index 01e45b7..15127d2 100644 --- a/cloudmon/service/grafana.py +++ b/cloudmon/service/grafana.py @@ -246,6 +246,7 @@ def provision(self, config, check): r = ansible_runner.run( private_data_dir=config.private_data_dir, + artifact_dir=".cloudmon_artifact", playbook="install_grafana.yaml", inventory=config.inventory_path, extravars=extravars, diff --git a/cloudmon/service/sqldb.py b/cloudmon/service/sqldb.py index 35fe28a..e1444b4 100644 --- a/cloudmon/service/sqldb.py +++ b/cloudmon/service/sqldb.py @@ -35,6 +35,7 @@ def provision(self, check): ) r = ansible_runner.run( private_data_dir=self.config.private_data_dir, + artifact_dir=".cloudmon_artifact", playbook="install_postgresql.yaml", inventory=self.config.inventory_path, extravars=extravars, @@ -56,6 +57,7 @@ def provision(self, check): r = ansible_runner.run( private_data_dir=self.config.private_data_dir, + artifact_dir=".cloudmon_artifact", playbook="manage_databases.yaml", inventory=self.config.inventory_path, extravars=extravars, diff --git a/cloudmon/service/statsd.py b/cloudmon/service/statsd.py index 3572439..fa80ac3 100644 --- a/cloudmon/service/statsd.py +++ b/cloudmon/service/statsd.py @@ -45,6 +45,7 @@ def provision(self, check): ) r = ansible_runner.run( private_data_dir=self.config.private_data_dir, + artifact_dir=".cloudmon_artifact", playbook="install_statsd.yaml", inventory=self.config.inventory_path, extravars=extravars, diff --git a/cloudmon/service/tsdb.py b/cloudmon/service/tsdb.py index 5a6f972..baab46f 100644 --- a/cloudmon/service/tsdb.py +++ b/cloudmon/service/tsdb.py @@ -29,6 +29,7 @@ def provision(self, check): ) r = ansible_runner.run( private_data_dir=self.config.private_data_dir, + artifact_dir=".cloudmon_artifact", playbook="install_graphite.yaml", inventory=self.config.inventory_path, extravars=extravars, diff --git a/cloudmon/version.py b/cloudmon/version.py new file mode 100644 index 0000000..6bf892b --- /dev/null +++ b/cloudmon/version.py @@ -0,0 +1,16 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + + +import pbr.version + +__version__ = pbr.version.VersionInfo('stackmon').version_string() diff --git a/setup.cfg b/setup.cfg index fd05ad8..87d798c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,11 +1,11 @@ [metadata] -name = cloudmon +name = stackmon summary = CloudMon controller -description-file = +description_file = README.rst author = Open Telekom Cloud -home-page = https://open.telekom.cloud/ -python-requires = >=3.6 +home_page = https://open.telekom.cloud/ +python_requires = >=3.6 classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -20,9 +20,14 @@ classifier = Programming Language :: Python :: 3 :: Only Programming Language :: Python :: Implementation :: CPython +[pbr] +warnerrors = True + [files] packages = cloudmon +package-data = + cloudmon = ansible/**/*.yaml [entry_points] console_scripts = diff --git a/setup.py b/setup.py index 1f988cd..7f1bbe8 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,3 @@ -# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. -# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -13,7 +11,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools setuptools.setup( diff --git a/tox.ini b/tox.ini index 47b5035..ac5f6bd 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,9 @@ [tox] -minversion = 3.2.0 +minversion = 3.6.0 envlist = py39,pep8 skipsdist = True ignore_basepython_conflict = true - [testenv] basepython = python3 usedevelop = True @@ -25,16 +24,6 @@ commands = flake8 {posargs} [testenv:venv] commands = {posargs} -[testenv:cover] -setenv = - VIRTUAL_ENV={envdir} - PYTHON=coverage run --source cloudmon --parallel-mode -commands = - stestr run {posargs} - coverage combine - coverage html -d cover - coverage xml -o cover/coverage.xml - [testenv:docs] deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -W -b html doc/source doc/build/html @@ -44,12 +33,8 @@ deps = {[testenv:docs]deps} commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html -[testenv:debug] -commands = oslo_debug_helper {posargs} - [flake8] # E123, E125 skipped as they are invalid PEP-8. - show-source = True ignore = E123,E125,W503,H101 builtins = _