Merge "vars: Do not pull devel packages on distro installations"
This commit is contained in:
commit
7b165f69f4
@ -17,17 +17,17 @@ keystone_distro_packages:
|
|||||||
- ca-certificates
|
- ca-certificates
|
||||||
- cronie
|
- cronie
|
||||||
- cronie-anacron
|
- cronie-anacron
|
||||||
- cyrus-sasl-lib
|
|
||||||
- git
|
- git
|
||||||
|
- python-keystoneclient # Keystoneclient needed to OSA keystone lib
|
||||||
|
- rsync
|
||||||
|
|
||||||
|
keystone_devel_distro_packages:
|
||||||
|
- cyrus-sasl-lib
|
||||||
- libffi-devel
|
- libffi-devel
|
||||||
- libxml2-devel
|
- libxml2-devel
|
||||||
- libxslt-devel
|
- libxslt-devel
|
||||||
- openldap
|
|
||||||
- openldap-devel
|
- openldap-devel
|
||||||
- openssl
|
|
||||||
- python-devel
|
- python-devel
|
||||||
- python-keystoneclient # Keystoneclient needed to OSA keystone lib
|
|
||||||
- rsync
|
|
||||||
- which
|
- which
|
||||||
|
|
||||||
keystone_service_distro_packages:
|
keystone_service_distro_packages:
|
||||||
|
@ -34,6 +34,7 @@ keystone_package_list: |-
|
|||||||
{% if keystone_developer_mode | bool %}
|
{% if keystone_developer_mode | bool %}
|
||||||
{% set _ = packages.extend(keystone_developer_mode_distro_packages) %}
|
{% set _ = packages.extend(keystone_developer_mode_distro_packages) %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% set _ = packages.extend(keystone_devel_distro_packages) %}
|
||||||
{{ packages }}
|
{{ packages }}
|
||||||
|
|
||||||
_keystone_bin: "/openstack/venvs/keystone-{{ keystone_venv_tag }}/bin"
|
_keystone_bin: "/openstack/venvs/keystone-{{ keystone_venv_tag }}/bin"
|
||||||
|
@ -17,17 +17,17 @@
|
|||||||
keystone_distro_packages:
|
keystone_distro_packages:
|
||||||
- ca-certificates
|
- ca-certificates
|
||||||
- cronie
|
- cronie
|
||||||
- cyrus-sasl-devel
|
|
||||||
- git-core
|
- git-core
|
||||||
|
- python-keystoneclient # Keystoneclient needed to OSA keystone lib
|
||||||
|
- rsync
|
||||||
|
|
||||||
|
keystone_devel_distro_packages:
|
||||||
|
- cyrus-sasl-devel
|
||||||
- libffi-devel
|
- libffi-devel
|
||||||
- libxml2-devel
|
- libxml2-devel
|
||||||
- libxslt-devel
|
- libxslt-devel
|
||||||
- openldap2
|
|
||||||
- openldap2-devel
|
- openldap2-devel
|
||||||
- openssl
|
|
||||||
- python-devel
|
- python-devel
|
||||||
- python-keystoneclient # Keystoneclient needed to OSA keystone lib
|
|
||||||
- rsync
|
|
||||||
- which
|
- which
|
||||||
|
|
||||||
keystone_service_distro_packages:
|
keystone_service_distro_packages:
|
||||||
|
@ -14,8 +14,12 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
keystone_distro_packages:
|
keystone_distro_packages:
|
||||||
- docutils-common
|
|
||||||
- git
|
- git
|
||||||
|
- python-keystoneclient # Keystoneclient needed to OSA keystone lib
|
||||||
|
- rsync
|
||||||
|
|
||||||
|
keystone_devel_distro_packages:
|
||||||
|
- docutils-common
|
||||||
- libffi-dev
|
- libffi-dev
|
||||||
- libjs-sphinxdoc
|
- libjs-sphinxdoc
|
||||||
- libjs-underscore
|
- libjs-underscore
|
||||||
@ -25,8 +29,6 @@ keystone_distro_packages:
|
|||||||
- libxslt1-dev
|
- libxslt1-dev
|
||||||
- libxml2-dev
|
- libxml2-dev
|
||||||
- python-dev
|
- python-dev
|
||||||
- python-keystoneclient # Keystoneclient needed to OSA keystone lib
|
|
||||||
- rsync
|
|
||||||
|
|
||||||
keystone_service_distro_packages:
|
keystone_service_distro_packages:
|
||||||
- keystone
|
- keystone
|
||||||
|
Loading…
Reference in New Issue
Block a user