Merge "Generate KA config before `kolla ansible run
`"
This commit is contained in:
commit
f2b658ecb6
@ -436,7 +436,8 @@ function overcloud_deploy {
|
|||||||
run_kayobe kolla ansible run certificates \
|
run_kayobe kolla ansible run certificates \
|
||||||
--kolla-extra kolla_certificates_dir=${KAYOBE_CONFIG_PATH}/kolla/certificates \
|
--kolla-extra kolla_certificates_dir=${KAYOBE_CONFIG_PATH}/kolla/certificates \
|
||||||
--kolla-extra ansible_user=$USER \
|
--kolla-extra ansible_user=$USER \
|
||||||
--kolla-extra ansible_python_interpreter=/usr/bin/python3
|
--kolla-extra ansible_python_interpreter=/usr/bin/python3 \
|
||||||
|
--skip-tags kolla-openstack
|
||||||
unset ANSIBLE_CACHE_PLUGIN
|
unset ANSIBLE_CACHE_PLUGIN
|
||||||
|
|
||||||
# Add CA cert to trust store.
|
# Add CA cert to trust store.
|
||||||
|
@ -373,6 +373,11 @@ class KollaAnsibleRun(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
|
|||||||
|
|
||||||
def take_action(self, parsed_args):
|
def take_action(self, parsed_args):
|
||||||
self.app.LOG.debug("Running Kolla Ansible command")
|
self.app.LOG.debug("Running Kolla Ansible command")
|
||||||
|
|
||||||
|
# First prepare configuration.
|
||||||
|
self.generate_kolla_ansible_config(parsed_args)
|
||||||
|
|
||||||
|
# Run the kolla-ansible command.
|
||||||
self.run_kolla_ansible(parsed_args, parsed_args.command,
|
self.run_kolla_ansible(parsed_args, parsed_args.command,
|
||||||
parsed_args.kolla_inventory_filename)
|
parsed_args.kolla_inventory_filename)
|
||||||
|
|
||||||
|
@ -0,0 +1,11 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
``kayobe kolla ansible run`` will now generate Kolla-Ansible configuration
|
||||||
|
before the command is run. You can use ``--skip-tags kolla-openstack`` to
|
||||||
|
skip this for commands that do not require the kolla config.
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
``kayobe kolla ansible run`` will now generate Kolla-Ansible configuration
|
||||||
|
before the command is run. You can use ``--skip-tags kolla-openstack`` to
|
||||||
|
skip this for commands that do not require the kolla config.
|
Loading…
Reference in New Issue
Block a user