1363e0c9a72a06ecceec3cdeaba7215611c1e640
Commit Graph

216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
huang.zhiping
1363e0c9a7 import zuul job settings from project-config
This is a mechanically generated patch to complete step 1 of moving
the zuul job settings out of project-config and into each project
repository.
Because there will be a separate patch on each branch, the branch
specifiers for branch-specific jobs have been removed.
Because this patch is generated by a script, there may be some
cosmetic changes to the layout of the YAML file(s) as the contents are
normalized.
See the python3-first goal document for details:
https://governance.openstack.org/tc/goals/stein/python3-first.html
Change-Id: I77fadf17c4e08f837af3e375477a38bb0e4867f0
Story: #2002586
Task: #24319 
2018年08月21日 13:06:38 +00:00
Zuul
80e4c6f2d7 Merge "Use the TESTING_BRANCH env var for constraints" 2018年08月21日 09:53:53 +00:00
OpenStack Proposal Bot
b9a9aea2e6 Updated from OpenStack Ansible Tests
Change-Id: I4f28e1832e16f23fb0f283e7bcd50e95d120ef6c
2018年08月20日 10:47:47 +00:00
Zuul
2d82c48d84 Merge "Use include_tasks instead of include" 2018年08月18日 01:42:04 +00:00
Zuul
efa4714aeb Merge "Trivial: Fix the pep8 warning" 2018年08月17日 05:16:53 +00:00
Jesse Pretorius
d12e71498b Use the TESTING_BRANCH env var for constraints
The TESTING_BRANCH environment variable is provided by the
run_tests.sh script and is derived from the .gitreview file.
This ensures that once the master branch becomes a stable
branch, the constraints from the stable branch in the
integrated repository will automatically get used once the
.gitreview file is updated.
To ensure that the required environment variables are present
we export them appropriately in run_tests.sh and modify the
tox configuration to pass them into the tox test.
Change-Id: I21e185ac2127146b33cbd4e67b15134eaa6bf69f
Needed-By: https://review.openstack.org/579371 
2018年08月16日 15:41:32 +01:00
OpenStack Proposal Bot
3a426ceb8b Updated from OpenStack Ansible Tests
Change-Id: If2f0c08eaa97c4efd19b67ea79ef4eb8b424857c
2018年08月15日 13:40:28 +00:00
caoyuan
15c0163b1e Use include_tasks instead of include
include is marked as deprecated since ansible 2.4[0]
Switch to include_tasks or import_playbook as necessary
[0] https://docs.ansible.com/ansible/2.4/include_module.html#deprecated
Change-Id: I0297ca2a66b3344cfc20a1adf81b71339174a205
2018年08月15日 14:22:20 +08:00
9c324c3da8 Update reno for stable/rocky
Change-Id: Iafa86669b41be5641a9c5eb45a1e321beb928e0b
2018年08月10日 16:46:21 +00:00
Jesse Pretorius
00097c026b Allow tags to be used for MQ tasks
The use of 'include_tasks' and a loop of variables creates
a situation where a user is unable to use tags to scope the
inclusion of only the MQ tasks when running the playbooks.
The use-case this is important for is when the rabbitmq
containers are destroyed and rebuilt in order to resolve
an issue with them, and the user wishes to quickly recreate
all the vhosts/users.
Ansible's 'include_tasks' is a dynamic inclusion, and dynamic
inclusions are not included when using tags. The nice thing
about dynamic inclusions is that they completely skip all
tasks when the condition does not apply, cutting down deploy
time. However, given the use-case, we should rather take on
the extra deployment time.
This patch changes the dynamic inclusion to a static one,
adds a 'common-mq' tag to cover all MQ implementations,
and re-implements the 'common-rabbitmq' tag for the tasks
that relate to RabbitMQ specifically.
It also implements conditionals for each task set so that
the rpc/notify tasks can be skipped if a vhost/user is not
required for that purpose (eg: swift does not use RPC, and
most roles will not use notifications by default).
Depends-On: https://review.openstack.org/588191
Change-Id: Ied4df931d0464173649c39ac82253c541b195cb1
2018年08月07日 12:58:15 +01: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
Andy Smith
cfddca21eb Update to use oslo.messaging service RPC and Notify
This introduces oslo.messaging variables that define the RPC and
Notify transports for the OpenStack services. These parameters replace
the rabbitmq values and are used to generate the messaging
transport_url for the service.
This patch:
* Add oslo.messaging variables for RPC and Notify to defaults
* Update transport_url generation in conf
* Add oslo.messaging to tests inventory and update tests
* Install extra packages for optional drivers
* Add release note
Change-Id: I0612252927f81b3584054f6cd77a2826c5d3fc3b
2018年07月31日 08:31:18 +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
Zuul
4c840ae84c Merge "Update the default collector" 2018年07月11日 20:09:02 +00:00
Jesse Pretorius
ddb31b12a8 Execute service setup against a delegated host using Ansible built-in modules
In order to reduce the packages required to pip install on to the hosts,
we allow the service setup to be delegated to a specific host, defaulting
to the deploy host. We also switch as many tasks as possible to using the
built-in Ansible modules which make use of the shade library.
The 'virtualenv' package is now installed appropriately by the openstack_hosts
role, so there's no need to install it any more. The 'httplib2' package is a
legacy Ansible requirement for the get_url/get_uri module which is no longer
needed. The keystone client library is not required any more now that we're
using the upstream modules. As there are no required packages left, the task
to install them is also removed.
With the dependent patches, the openstack_openrc role is now executed once
on the designated host, so it is no longer required as a meta-dependency for
the role.
Depends-On: https://review.openstack.org/579233
Depends-On: https://review.openstack.org/579959
Change-Id: Ib46638d1cb35e677ecfe789a32bb69a024042d6f
2018年07月06日 13:48:47 +00:00
Zuul
94debf0b96 Merge "Update server to service" 2018年07月02日 23:55:59 +00:00
Heba Naser
eb17d26ebf Use tests repo for common role test requirements
Using tox for requirements management requires in-repo
requirements files for all our repositories. Rather than
do that, we make use of the tests repo to capture our
common requirements and use this to install them.
This reduces our review requirement rate and simplifies
maintenance for us for the tox config. It also makes it
usable with 'Depends-On', which is marvellous!
The tox requirements definitions for docs/releasenotes
builds are left in-place as those are standard entries
across the community. If that changes at some point, we
can re-assess those entries too.
Depends-On: https://review.openstack.org/579208
Change-Id: Ib9a986352cf525d7d78ff3cfe1c63d74e30bff8d
2018年07月02日 12:38:54 -04:00
Zuul
71df8fbd44 Merge "Move database creation into role" 2018年07月02日 15:48:39 +00:00
LeopardMa
982f2dad83 Add source code repository notes link to README
Change-Id: I735c45cc492a56b42b2a16bbf41cb4cc85d04d28
2018年06月30日 05:26:44 -04:00
ZhijunWei
2b1a230452 Update server to service
Change-Id: Ie051d256da7d1776fa045412ba5e64ee9591686e
2018年06月28日 08:34:45 +00:00
Heba Naser
681d0961a4 Switch to using project-templates
In order to have more centralized configuration, switch the role
to use the project-template instead.
Depends-On: I3df2c670beeb78baaa1515bcd27e8f2b0d95b3a9
Change-Id: I4a18fc449bad3395547baa0f4ba1e4f95e8900e0
2018年06月24日 17:48:59 +00:00
Mohammed Naser
55691f7ddc Add openSUSE support
Change-Id: I4bd223a3f5fbd36839e8b79103994ba4a7122fd8
2018年06月24日 12:31:35 -04:00
Zuul
e3b387c9a1 Merge "Add packages required for osprofiler" 2018年06月22日 15:13:44 +00:00
Zuul
1137f349f4 Merge "Use coordination to prevent duplicate pricing" 2018年06月20日 03:55:14 +00:00
melissaml
c8f815e9d8 Update README.rst information
1) Add documentation url link.
2) Add release notes url link.
3) Add the project home url link.
Change-Id: I9d47b013fbcea1fa765754b19999babf38dc4a3e
2018年06月19日 10:30:19 +08:00
Christian Zunker
81991f8621 Use coordination to prevent duplicate pricing
Use MySQL as coordination backend for cloudkitty-processors.
Otherwise prices may get calculated multiple times.
Change-Id: I661ca3b7ffb4f64242422297bafc938ca5082a12
Closes-Bug: 1777432
2018年06月18日 14:16:16 +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
Kevin Carter
610153f5af Add packages required for osprofiler
The following packages are required in-order to run osprofiler.
these packages will provide deployers the ability to profile
a service on demand should they choose to enable the profile
functionality.
Change-Id: Ib058bc3dc6e97871f9c3a177c7f7dec48709ec3f
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
2018年06月11日 22:57:34 -05:00
OpenStack Proposal Bot
b5dd4cdd8f Updated from OpenStack Ansible Tests
Change-Id: If2f0eef5da0a2347b575ec59d1f8efcf85c9ebc9
2018年06月06日 00:40:47 +00:00
OpenStack Proposal Bot
1a8dadbfdd Updated from OpenStack Ansible Tests
Change-Id: Ia168ab1ab8a5f868c3686b4f68b5c25bcb659c90
2018年06月01日 22:05:55 +00:00
chenxing
af1a740da5 Update the default collector
As the ceilometer collector has been removed from cloudkitty repo[1],
we should stop to use it.
[1]https://review.openstack.org/#/c/548630/
Change-Id: I9c244e6a763c2fd82a1f32915e033c4c1b0df280
2018年05月25日 18:51:49 +08:00
Zuul
0c91342364 Merge "Update the outdated links" 2018年05月10日 02:04:54 +00:00
OpenStack Proposal Bot
4813beda73 Updated from OpenStack Ansible Tests
Change-Id: Ic32d0ad2a8d323a95645263c0e970e387152483b
2018年05月09日 19:40:28 +00:00
Zuul
8a29e5e319 Merge "Use cloudkitty_collector also for section config" 2018年05月09日 10:24:53 +00:00
Zuul
ca8e607d86 Merge "Loosen up the sqlalchemy requirements" 2018年05月09日 10:24:52 +00:00
Zuul
357be311f8 Merge "Use two seperate service variables" 2018年05月09日 10:24:49 +00:00
Zuul
f7ee478161 Merge "Use tags only once" 2018年05月09日 10:24:48 +00:00
lidong
42cec916dc Update the outdated links
Change-Id: I997b79594e3848efa1ae43bdffc75fb41c580293
2018年05月08日 10:11:17 +08:00
Christian Zunker
a76c225a09 Add missing api_paste sections
The sections are part of the cloudkitty repo:
https://github.com/openstack/cloudkitty/blob/master/etc/cloudkitty/api_paste.ini
But weren't inlcuded in osa.
Change-Id: I2579c8b88bcf2ec162002a8a8978c7720bfc8112
Closes-Bug: 1769630
2018年05月07日 13:35:25 +02:00
Christian Zunker
0cc6dff38b Use cloudkitty_collector also for section config
Each collector needs its own config section, so use cloudkitty_collector
to create these sections.
Change-Id: I6bc4c395693265ea08067bb293a99a72b48fe9a6
Closes-Bug: 1769629
2018年05月07日 13:25:01 +02:00
Christian Zunker
9b523f9cc9 Use two seperate service variables
Use one variable for collected openstack services and another for
systemd services.
Change-Id: I1946243df319c00638e4ec4a4f1f144fd2131956
Closes-Bug: 1769625
2018年05月07日 13:18:53 +02:00
Christian Zunker
8824683861 Use tags only once
Change-Id: I585f57c69f5d0c3e415f784152f8f900ac0c56ca
Closes-Bug: 1769624
2018年05月07日 13:12:02 +02:00
Christian Zunker
8de46d1d7f Loosen up the sqlalchemy requirements
The upstream requierements do not fit openstack-ansible venvs.
So explicitly loosen up until fixed upstream.
Change-Id: I307c9eefac4ab25a88bee7621461e41320bc4a70
Closes-Bug: 1769621
2018年05月07日 13:07:47 +02:00
Zuul
5a9f24a70e Merge "Updated from OpenStack Ansible Tests" 2018年05月07日 08:22:37 +00:00
OpenStack Proposal Bot
8dbb351488 Updated from OpenStack Ansible Tests
Change-Id: I26835fa198ffd6ecfdbddeea75a17014eb0b5ad6
2018年04月30日 05:13:43 +00:00
Jesse Pretorius
94b71a3b0a Only replace python when re-initializing the venv
We reinitialize the venv to ensure that the right version of
python is in the venv, but we do not want virtualenv to also
replace pip, setuptools and wheel so we tell it not to. If we
don't do this then virtualenv will install the latest available
version, which is not what we want.
Change-Id: Id29497b36cd2b9cca3f3b08474e1001d528931b6
Partial-Bug: #1764470 
2018年04月26日 12:24:00 +00:00