80e4c6f2d71ed5308569bf4fb3ad00c8a94783a8
Commit Graph

12 Commits

Author SHA1 Message Date
Zuul
efa4714aeb Merge "Trivial: Fix the pep8 warning" 2018年08月17日 05:16:53 +00:00
wangqi
7f96645298 Trivial: Fix the pep8 warning
The yaml should start with "---"
Change-Id: Iaf43682075718e85c1e22f8d4ac28fd65dea0d17
2018年08月06日 07:23:44 +00:00
Kevin Carter
b78966cd09 Convert role to use a common systemd service role
This removes the systemd service templates and tasks from this role and
leverages a common systemd service role instead. This change removes a
lot of code duplication across all roles all without sacrificing features
or functionality. The intention of this change is to ensure uniformity and
reduce the maintenance burden on the community when sweeping changes are
needed.
The systemd journal would normally be populated with the standard out of
a service however with the use of uwsgi this is not actually happening
resulting in us only capturing the logs from the uwsgi process instead
of the service itself. This change implements journal logging in the
service config, which is part of OSLO logging.
OSLO logging docs found here: <https://docs.openstack.org/oslo.log/3.28.1/journal.html>
Change-Id: Ieff0119cb09e8971fab5b0393f023010a554edff
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
2018年07月31日 14:50:12 -05:00
Jesse Pretorius
1ab9470007 Cleanup playbook, vars and overrides
1. The venv tag override is unnecessary, given there is a default.
2. The install branch override is unnecessary, given there is a
 default. The constraint in defaults was set to use the
 'cloudkitty_requirements_git_install_branch' instead of this
 variable anyway. This has been corrected to the right var.
3. The galera address for role tests has a specific var for it.
4. The 'cloudkitty_requirements_git_install_branch' is a relic
 of the past, and has been removed.
5. The playbook is very dated and is using a lot of old mechanisms
 and unnecessary vars. It is updated to be normalised with the
 playbooks from the integrated build.
Change-Id: I6a8e8b3ec8b00790416648beb1c4ce0257406409
2018年07月31日 08:31:52 +01:00
Jesse Pretorius
19f299854e Move MQ vhost/user creation into role
There is no record for why we implement the MQ vhost/user creation
outside of the role in the playbook, when we could do it inside the
role.
Implementing it inside the role allows us to reduce the quantity of
group_vars duplicated from the role, and allows us to better document
the required variables in the role. The delegation can still be done
as it is done in the playbook too.
In this patch we implement two new variables:
- cloudkitty_oslomsg_rpc_setup_host
- cloudkitty_oslomsg_notify_setup_host
These are used in the role to allow delegation of the MQ vhost/user
setup for each type to any host, but they default to using the first
member of the applicable oslomsg host group.
We also adjust some of the defaults to automatically inherit existing
vars set in group_vars form the integrated build so that we do not
need to do the wiring in the integrated build's group vars. We still
default them in the role too for independent role usage.
Finally, we remove the test mq setup tasks and clean up any unused
or unnecessary variables configured in tests.
Change-Id: Iac217b80df3da79a944185a90ba4c1ff5409945b
2018年07月31日 08:31:19 +01:00
zhulingjie
44037f0c1b Remove the unnecessary space
Change-Id: I5dd365ec21959c60df5f83ad98705f94633e3d8e
2018年07月11日 23:18:19 -04:00
Jean-Philippe Evrard
cad8710a8d Fix usage of "|" for tests
With the more recent versions of ansible, we should now use
"is" instead of the "|" sign for the tests.
This should fix it.
Change-Id: I77c037ec01e192ec0723050c05e296d4ccbfb79e
2018年07月12日 16:54:43 +02:00
Jesse Pretorius
3fec5b02ec Move database creation into role
There is no record for why we implement the database creation outside
of the role in the playbook, when we could do it inside the role.
Implementing it inside the role allows us to reduce the quantity of
group_vars duplicated from the role, and allows us to better document
the required variables in the role. The delegation can still be done
as it is done in the playbook too.
In this patch we implement a new variable called 'cloudkitty_db_setup_host'
which is used in the role to allow delegation of the database setup
task to any host, but defaults to the first member of the galera_all
host group. We also document the variable cloudkitty_galera_address which
has been used for a long time, but never documented.
Change-Id: I7bb3f38556558ef14723361d3672a1d06f839b52
2018年06月12日 20:40:05 +01:00
Jean-Philippe Evrard
13b51e5c26 Do not log passwords
This prevents data to be leaked into the callback plugin.
Change-Id: If71d5efc15c4867f877d147349fb3c5ae7b42e95
2018年04月11日 13:54:02 +02:00
Pedro Perez
be53f8eca8 update naming conventions for secret vars
Change-Id: I523b5f1ae56c1ff19ca6bd95e3e0e7f00e282c71
2016年11月18日 16:42:48 +01:00
Kevin Carter
b13646c716 Remove deprecated ansible_ssh_host variable
This changes 'ansible_ssh_host' to 'ansible_host'. The 'ansible_ssh_host'
variable has been deprecated as noted here: [0].
[0] - http://docs.ansible.com/ansible/intro_inventory.html#hosts-and-groups
Change-Id: I667cb70dd0fef80699cc9f6cb44091cddaaaa57b
Related-Bug: #1636606
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
2016年10月25日 19:41:55 +00:00
Michael Rice
6d6ca0c8fa Adding the extras and tests with updated readme
This change includes the bits needed to add to osa such
as the playbook and env.d file.
2016年05月19日 22:21:55 -05:00