Synchronise configuration with stable/queens Kayobe
Sync was performed with Kayobe @ 535d2c6b9e9caf064f89db15ad800b336fd54360. Change-Id: I118f150c2cbdff1c70f23b7a498a4d557d830bcd
This commit is contained in:
parent
73bfb9c18a
commit
dcc382214d
|
@ -79,7 +79,7 @@
|
||||||
# kolla_install_type=source. See kolla.common.config for details.
|
# kolla_install_type=source. See kolla.common.config for details.
|
||||||
# Example:
|
# Example:
|
||||||
# kolla_sources:
|
# kolla_sources:
|
||||||
# ironic_base:
|
# ironic-base:
|
||||||
# type: git
|
# type: git
|
||||||
# location: https://github.com/openstack/ironic
|
# location: https://github.com/openstack/ironic
|
||||||
# reference: master
|
# reference: master
|
||||||
|
@ -145,6 +145,7 @@
|
||||||
#kolla_openstack_logging_debug:
|
#kolla_openstack_logging_debug:
|
||||||
|
|
||||||
# Upper constraints file for installation of Kolla.
|
# Upper constraints file for installation of Kolla.
|
||||||
|
# Default value is {{ pip_upper_constraints_file }}.
|
||||||
#kolla_upper_constraints_file:
|
#kolla_upper_constraints_file:
|
||||||
|
|
||||||
# User account to use for Kolla SSH access.
|
# User account to use for Kolla SSH access.
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
---
|
---
|
||||||
|
|
||||||
|
# Upper constraints file for installation of python packages.
|
||||||
|
# Default value is
|
||||||
|
# "https://releases.openstack.org/constraints/upper/queens"
|
||||||
|
#pip_upper_constraints_file:
|
||||||
|
|
||||||
# Use a local PyPi mirror for installing Pip packages
|
# Use a local PyPi mirror for installing Pip packages
|
||||||
#pip_local_mirror: false
|
#pip_local_mirror: false
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue