49 Commits

Author SHA1 Message Date
Jorge Merlino
9adc198f74 Sync with charm-helpers
This sync includes these patches to charm helpers:

https://github.com/juju/charm-helpers/pull/740
https://github.com/juju/charm-helpers/pull/757

Both are meant to include templates to configure service tokens
in juju charms as shown in this lp bug:

Related-Bug: #1992840
Change-Id: I31e95e227f82a4049d5f639516ed4ef5ef52d354
2023-05-18 16:24:06 -03:00
Corey Bryant
05efc621c4 Add Antelope support
* sync charm-helpers to classic charms
* change openstack-origin/source default to antelope
* align testing with antelope
* add new antelope bundles
* add antelope bundles to tests.yaml
* add antelope tests to osci.yaml and .zuul.yaml
* update build-on and run-on bases

Change-Id: I70cadc739d692cf442aef8012477e89a9601c06f
2023-03-07 20:07:40 +00:00
Alex Kavanagh
1d06b80c8d ch-sync: IndentityServiceContext app data fixes
The IdentityServiceContext was recently updated to add the application
data bag. Unfortunately, they keystone charm uses both the regular
relation data primarily, but the updates for endpoints are on both the
application database and the regular relation data. The
IdentityServiceContext used the app data bag exclusively if there were
any keys available, which leads to it ignoring the existing relation
data entirely; this results in 'identity relation not ready' with
missing data items.

charm-helpers is patched at [1] to solve the issue and this is a
charm-helpers sync that includes that patch.  This changes the
functionality of the IdentityServiceContext so that it preferentially
selects keys from the application data bag unless they are None, in
which case it tries for those keys on the existing relation data. e.g.
it will stitch the two relations together with the app data bag taking
priority. This allows the nova-cloud-controller charm to correctly
access the identity relation data and form a complete context.

[1] https://github.com/juju/charm-helpers/pull/746

Change-Id: Ic868213c6bb42bc2a28ad25a2f7344a28ab9f04d
2022-11-03 16:02:51 +01:00
Corey Bryant
f9206facde Add Kinetic and Zed support
* sync charm-helpers to classic charms
* change openstack-origin/source default to zed
* align testing with zed
* add new zed bundles
* add zed bundles to tests.yaml
* add zed tests to osci.yaml and .zuul.yaml
* update build-on and run-on bases
* add bindep.txt for py310
* sync tox.ini and requirements.txt for ruamel
* use charmcraft_channel 2.0/stable
* drop reactive plugin overrides
* move interface/layer env vars to charmcraft.yaml

Change-Id: I8f2c34f3a4a0601ee19aa694b323cc0f9ee65616
2022-08-26 18:40:41 +00:00
Felipe Reyes
43848ce1fc charm-helpers sync.
This sync is needed to bring in 2 fixes:

- python 3.10 (collections.abc.Iterable).
- Handle NoNameservers exception in ns_query().

Change-Id: I0b965b47b814e99d484682d7c90dcd60dd810ae7
2022-04-22 10:00:06 -04:00
Alex Kavanagh
77992a5a48 charmhelpers sync for yoga release
Change-Id: I230b814a9944d4dab15aeb020504df3170a1978f
2022-04-07 12:26:30 +01:00
Edward Hope-Morley
f501a36bc9 Sync charmhelpers to get fixes
Change-Id: I40d3827949caf36b9d019985802e97806d91c025
Related-Bug: #1965967
2022-03-28 11:35:49 +01:00
Corey Bryant
e0a38a6393 Add yoga bundles and release-tool syncs
* charm-helpers sync for classic charms
* sync from release-tools
* switch to release-specific zosci functional tests
* run focal-ussuri as smoke tests
* remove trusty, xenial, and groovy metadata/tests
* drop py35 and add py39

Change-Id: I8f7e9ee598a5fc218ccd68f4af36ea323af08bbb
2021-11-19 14:28:42 -05:00
Alex Kavanagh
222530b515 Add xena bundles
- add non-voting focal-xena bundle
- add non-voting impish-xena bundle
- charm-helpers sync for new charm-helpers changes
- update tox/pip.sh to ensure setuptools<50.0.0

Change-Id: I1dadd96087714bf5a88f324d615d2c3126f66690
2021-09-27 15:51:23 +01:00
Corey Bryant
306ff634ee c-h sync - restore proxy env vars for add-apt-repository
Change-Id: If2a07274d35622ae3b22022ea35ca74a1b76a9f4
2021-05-13 08:47:16 -04:00
Alex Kavanagh
77a1bee1f2 21.04 sync - add 'hirsute' in UBUNTU_RELEASES
The 'hirsute' key in c-h/core/host_factory/ubuntu.py:
UBUNTU_RELEASES had been missed out, and is needed for
hirsute support in many of the charms.  This sync is to
add just that key.  See also [1]

Note that this sync is only for classic charms.

[1] https://github.com/juju/charm-helpers/pull/598

Change-Id: I28452434a99bdd317eecaad65c49759605fa6e21
2021-04-11 16:58:26 +01:00
Alex Kavanagh
c59fa98451 21.04 libraries freeze for charms on master branch
* charm-helpers sync for classic charms
* build.lock file for reactive charms
* ensure tox.ini is from release-tools
* ensure requirements.txt files are from release-tools
* On reactive charms:
  - ensure stable/21.04 branch for charms.openstack
  - ensure stable/21.04 branch for charm-helpers

Change-Id: I95f8da0789b7f165677b031284acc4fadfdfeab4
2021-04-03 20:31:22 +01:00
Aurelien Lourot
bd3e24f359 Fix for not passing CA cert to nova-compute
The charm looked for `keystone_juju_ca_cert` on disk
instead of
`/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt`

Synced charm-helpers for
https://github.com/juju/charm-helpers/pull/570

Change-Id: Ib7cfdadc3a75fca951792ef2c2e2b454b1ad021d
Closes-Bug: #1915504
2021-02-16 14:45:03 +01:00
Alex Kavanagh
0e02c9a207 Hotfix charmhelpers sync for local_address() fix
The network-get --primary-address juju-info fails on pre-2.8.?
versions of juju.  This results in a NoNetworkBinding error.
Fallback to unit_get() if that occurs for local_address().

Note: func-test-pr is to test a change in zaza around model deletion.

Change-Id: I758571613a945631e16412c9515b931029538c00
func-test-pr: https://github.com/openstack-charmers/zaza/pull/410
2021-01-21 14:50:45 +00:00
Alex Kavanagh
51b3383b03 Updates for testing period for 20.01 release
Includes updates to charmhelpers/charms.openstack for cert_utils
and unit-get for the install hook error on Juju 2.9

* charm-helpers sync for classic charms
* rebuild for reactive charms
* ensure tox.ini is from release-tools
* ensure requirements.txt files are from release-tools
* On reactive charms:
  - ensure master branch for charms.openstack
  - ensure master branch for charm-helpers
* Remove unit_get mock from unit tests as not in charmhelpers context

Change-Id: Ic828c8d6dd45148a1684c74d3f2b2157cfe6bbc4
2021-01-18 19:05:18 +00:00
Alex Kavanagh
f4e3c8f21c Updates for testing period for 20.01 release
* charm-helpers sync for classic charms
* rebuild for reactive charms
* ensure tox.ini is from release-tools
* ensure requirements.txt files are from release-tools
* On reactive charms:
  - ensure master branch for charms.openstack
  - ensure master branch for charm-helpers

Change-Id: I65d378de1b124c3c668e05bb37c79fe45596747b
2021-01-12 15:40:54 +00:00
Rodrigo Barbieri
171f6b778a Sync charm-helpers for commit e7450c6
Updating nova-cloud-controller nova.conf
[placement] template with appropriate
region_name variable for recent
OpenStack versions where os_region_name
was deprecated and removed.

Change-Id: I1a15aee31cf9a43751f987f8588ac40ec27b7fa6
2020-11-21 15:39:49 -03:00
Chris MacNaughton
9e4cc43fdb Batch update to land Ubuntu Groovy support into the charms
Cherry-Pick from 09752a1527

Change-Id: If7763feebaa138f2a986f5a7dcf4b25ec8d9c4cf
2020-10-12 11:23:33 +02:00
Alex Kavanagh
1beb8444b4 Sync libraries & common files prior to freeze
* charm-helpers sync for classic charms
* charms.ceph sync for ceph charms
* rebuild for reactive charms
* sync tox.ini files as needed
* sync requirements.txt files to sync to standard

Change-Id: Ie7640826be5426157c57877348cef43ab6067543
2020-09-28 09:37:24 +01:00
Alex Kavanagh
74e5da0e2e Release sync for 20.08
- Classic charms: sync charm-helpers.
- Classic ceph based charms:  also sync charms.ceph
- Reactive charms: trigger a rebuild
- sync tox.ini
- sync requirements.txt and test-requirements.txt

Change-Id: Ia2465d93c3d17e81690bab9cb6ee57e373b5caf5
2020-07-27 20:56:52 +01:00
Corey Bryant
4c6287a180 Sync charm-helpers for Victoria/Groovy updates
This sync picks up the release and version details for Victoria/Groovy.

Change-Id: I2aa9a57f401855e2574517fb7a30b577a27bd0d4
2020-07-13 19:00:36 +00:00
Liam Young
3ad5891419 CH Sync for rabbit relation bug fix
Charmhelper sync to pick up the fix to the AMQP context.

Change-Id: I663dca207a42707859396d97edc5bbe3f24b29ba
Closes-Bug: #1796886
2020-06-25 10:04:17 +00:00
Alex Kavanagh
385b65439b Updates for 20.08 cycle start for groovy and libs
- Adds groovy to the series in the metadata
- Classic charms: sync charm-helpers.
- Classic ceph based charms:  also sync charms.ceph
- Reactive charms: trigger a rebuild

Change-Id: I523f4cbd22f65faa0959943324101a114fa16ae8
2020-06-02 14:34:42 +01:00
Aurelien Lourot
d4a79f28dd Pre-freeze 'make sync'
Change-Id: Ic0fa75b716a01aed6e9b5cfcb7e8c31f073b9266
2020-05-06 16:29:23 +02:00
David Ames
86bb59ec3e Specify port for mysql connection
Change-Id: I35cadeed547e669bc68a380dbf50929e304b697c
2020-05-05 16:16:52 -07:00
Hemanth Nakkina
b5b6966f6d Add new config option to set [quota].count_usage_from_placement
New config option count_usage_from_placement is added in Nova from
Train release to enable/disable counting of quota usage from placement
service. Corresponding config parameter is required in nova-cloud-controller
charm.

This patch introduces quota-count-usage-from-placement config parameter in
nova-cloud-controller charm. For openstack releases train or above, this
option is rendered in nova.conf for nova-cloud-controller units.

func-test-pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/250
Change-Id: I57b9335b7b6aecb8610a66a59cb2e4e506e76a5e
Closes-Bug: #1864859
2020-04-28 18:07:21 +05:30
Liam Young
335b67c66a Watch & react to placement and neutron ep changes.
Request to be informed of changes to placement and neutron changes.
If a placement change occurs restart nova-scheduler as it will
cache the old endpoint url and tell nova-compute to restart its
services as they will have done the same.

Change-Id: I7537723e40a5a25672fbbdc2d5c3144724f6240a
Closes-Bug: #1862974
2020-02-18 12:16:49 +00:00
Liam Young
9913156282 Charmhelper sync for 20.02
Change-Id: I0d5ccb2ca19c64e0f6a30d8e04ecddac35510c49
2020-02-04 16:39:37 +00:00
Liam Young
0a300b919e When resuming, exclude haproxy
When resuming services exclude those managed by hacluster, in
this case haproxy. If pacemaker lacks quorum it may shut haproxy
down which will cause this charm to error.

Charmhelper sync included to bring in required
get_managed_services_and_ports method.

Change-Id: I063c168595bee05c924cb23469f8dc866a43982b
2020-01-25 07:47:57 +00:00
Corey Bryant
a7c2e49fcf Sync charm-helpers for Ussuri/Focal release and version details
Also drop the gate-basic-disco-stein test now that Disco is EOL.

Change-Id: Iee0566e743e3453e43709941bdc11bc10b2c87aa
2020-01-21 19:10:38 +00:00
Corey Bryant
41a36a3d1e Switch to placement config from charm-helpers
The placement config may eventually be shared among more than one
charm as more services begin to use it. This patch drops the local
sectional config and uses the same sectional config that now exists
in charm-helpers.

charm-helpers was synced to pick up this change.

Change-Id: I42b415d7c4834cd74887c27b2f4a4daeb8eae636
Related-Bug: 1850691
2019-10-31 19:36:05 +00:00
Alex Kavanagh
f7f6fa295c Policyd override implementation
This patchset implements policy overrides for nova-cloud-controler.

This change includes a charm-helpers sync to bring in the policyd helper
code.

Note there are no functional tests for this feature as the charm still
uses the old style non-zaza amulet framework.  The Related-Bug below is
tracking this issue.

Change-Id: Ia5f3f8189d4a7b7b46a827707d964ebe40740aeb
Closes-Bug: #1741723
Related-Bug: #1845639
2019-10-07 22:16:36 +01:00
Ryan Beisner
cbf5b0bff8
Sync charm/ceph helpers, tox, and requirements
Change-Id: If70d66e7f279e9052fbafaa55019cb4a1754bc95
2019-09-30 21:43:36 -05:00
Corey Bryant
2b3972f5f1 Sync charm-helpers and use "rabbit_use_ssl" for ocata
Ensure "rabbit_use_ssl" is specified in the [oslo_messaging_rabbit]
config section instead of "ssl" for Ocata, since "ssl" was not yet
introduced.

Change-Id: I27f89f3780a60c6fbb26d8aad637853403bddeb1
Closes-Bug: #1838696
2019-08-01 23:08:14 -04:00
Chris MacNaughton
764b8027b3 Sync charm-helpers
Change-Id: I7436d0d90b90fb1b6f97259387d11d879eee3a1c
2019-07-16 07:06:03 +00:00
Rodrigo Barbieri
a51efaf640 Propagate vendor_data from nova-cloud-controller
When using DVR and L3HA neutron deployment options,
Nova API Metadata requests are served from compute nodes,
instead of from neutron-gateway nodes.

This change allows nova-cloud-controller to send vendor_data
configuration values to nova-compute charm relation so it
can write to nova-compute's nova.conf appropriately.

Replaced the existing context logic with inheritance
from a new context created in charm-helpers, so the
logic can be shared across several charms that write
vendor metadata to nova.conf and vendor_data.json.

Also, small fix in the vendor-data and vendor-data-url
descriptions, where it was incorrectly stating that such
configuration would be effective in nova-cloud-controller
on Queens release.

The values set in vendor-data and vendor-data-url config
options will always be propagated to nova-compute regardless
of the OpenStack release. Those values will continue to only
be effective in nova-cloud-controller nodes on Rocky release
or later.

Included sync of charm-helpers code in order to inherit
the refactored vendor metadata contexts.

Change-Id: If8373fc6b2d04dbc29ed07896d385ac920cae3f4
Depends-On: I0c79e1bfac9fbe7009a7e862ad010cfa2de8cfda
Closes-Bug: #1777714
2019-06-05 10:22:56 -03:00
Chris MacNaughton
9401b5e9e0 Sync charm-helpers to enable Ubuntu Disco
Change-Id: Icbf5304bb19eecc6966b786ca266e95e2497684d
2019-04-05 17:16:09 +02:00
Chris MacNaughton
dd341e4d2d Sync charm-helpers for Stein release
As a part of the Stein release, we need to ensure
that charmhelpers is up to date.

Change-Id: Ie7174e1a9788a82c592b25441a3cbc1c2c3f0fd4
2019-04-04 10:17:12 +02:00
Frode Nordahl
9414223b22
Allow console service to read certificate data
The console proxy service run as user ``nova`` throughout its lifespan,
it has no load certificates before dropping privileges mechanism.

Set file permissions on certificate files to support this.

Sync charm helpers.

Closes-Bug: #1819140
Change-Id: I597b82070e51506c56500267daa2b59d8145b9f9
2019-03-22 11:19:15 +01:00
Chris MacNaughton
370e4b8380 Add security-checklist action
Change-Id: I717ddc16d29d4e45e374c98e6e0f7913c9583522
2019-03-13 10:33:15 +01:00
Corey Bryant
66b4c91b5f Drop deprecated rabbit driver config options
The stein version of python-oslo.messaging (9.0.0+) has removed
the following config options from the [oslo_messaging_rabbit]
section:

rabbit_host, rabbit_port, rabbit_hosts, rabbit_userid,
rabbit_password, rabbit_virtual_host rabbit_max_retries, and
rabbit_durable_queues.

The above change requires a sync from charm-helpers.

These have been deprecated since Ocata, therefore this change
will be provided to pre-Stein templates in order to drop
deprecation warnings.

See release notes at:
https://docs.openstack.org/releasenotes/oslo.messaging/index.html

Change-Id: Id4a31a8ccfb2735d76dffe30c91c3ae733baa76b
Closes-Bug: #1817672
2019-02-26 10:35:08 +00:00
David Ames
80b597d5a2 Update charm-helpers-hooks.yaml and sync ch
Using the new version of the sync tool which removes the charmhelpers
directory before syncing, run charm helpers sync to find any unexpected
missing dependencies.

Change-Id: I1d414271c6191829992a8628de62f160dfc66ee0
2019-02-12 15:57:51 -08:00
Corey Bryant
fb51b3159a Sync charm-helpers
Change-Id: Ia7bfb40e123078063d8b78d44ba1ecc9b9b12722
2019-01-11 14:38:54 +00:00
Zuul
d9a92b87d0 Merge "fix typos in the docstring" 2019-01-09 09:25:40 +00:00
Corey Bryant
5b38cf05cb Sync charm-helpers
Change-Id: Icc23f15476b51da75c1cc2f970a4cfdd398e1c98
2019-01-08 15:18:53 +00:00
melissaml
177365fa46 fix typos in the docstring
Change-Id: Ib5fd180cba43724d221d8f869735d7dab1db7988
2018-12-22 03:56:58 +08:00
Liam Young
6d1d15149e Use chelper generate_ha_relation_data for ha rel
Use the generate_ha_relation_data helper from charmhelpers to
generate the data to send down the relation to the hacluster
charm.

This results in a few changes in behaviour:

1) The charm will no longer specify a nic name to bind the vip. This
   is because Pacemaker VIP resources are able to automatically
   detect and configure correct iface and netmask parameters based
   on local configuration of the unit.
2) The original iface named VIP resource will be stopped and deleted
   prior to the creation of the new short hash named VIP resource.

Change-Id: I7018e94e75c7c873c6c610b06d3e7cc9fedcc507
2018-11-29 12:58:23 +00:00
Ryan Beisner
3bcf3dcdbb
Sync charm-helpers
Change-Id: I783b17e77625a3973bf3fc3c57a6d25f1b10115e
2018-11-07 15:35:24 -06:00
Alex Kavanagh
9c12812735 Switch the charm to support py3
Some major changes:
* the charm has been rebased (from a Python perspective) to be rooted in
  the charm directory.  This is a single root.
* Imports have been changed so that the don't add lots of imports to the
  namespace of the module doing the import.
* The code that used to run at module import time has been made lazy
  such that it only has to run if the relevant functions are called.
  This includes restart_on_change parameters, the harden function and
  the parameters to the guard_map.  Appropriate changes will be
  submitted to charm-helpers.
* Several tests had to be re-written as (incorrect) mocking meant that
  text fixtures didn't actually match what the code was doing.  Thus,
  the tests were meaningless.
* This has had a net positive impact on the unit tests wrt to importing
  modules and mocking.

Change-Id: Id07d9d1caaa9b29453a63c2e49ba831071e9457f
2018-10-18 15:43:03 +01:00