openstack
/
instack-undercloud
Code Issues Proposed changes

Use enable-packages-install element 

There is already an element from tripleo-image-elements,
enable-packages-install, to switch the default install type to package
instead of source. This patch updates instack-undercloud to use
enable-packages-install and removes the duplicate
undercloud-package-install.

blueprint undercloud-elements
Change-Id: Iadc7940e56be19700977b0cdbd86aa010c105fb6
Depends-On: I8f47b495218a72f5a78d68b7c2610116a5b4984c
Depends-On: I8185aa56ea5225870bab50576023588af37ebedd
This commit is contained in:
James Slagle 2016-01-05 12:57:04 -05:00
parent dde13f2b38
commit 3083c864c9
3 changed files with 2 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
elements/undercloud-package-install/environment.d/00-package-install
View File

@ -1,51 +0,0 @@
#!/bin/bash
set -eux
export DIB_DEFAULT_INSTALLTYPE=${DIB_DEFAULT_INSTALLTYPE:-package}
export DIB_INSTALLTYPE_os_cloud_config=package
# Must define this manually, see:
# https://review.openstack.org/179101
export DIB_INSTALLTYPE_puppet_modules=${DIB_INSTALLTYPE_puppet_modules:-package}
# OpenStack projects
export DIB_INSTALLTYPE_heat=${DIB_INSTALLTYPE_heat:-package}
export DIB_INSTALLTYPE_keystone=${DIB_INSTALLTYPE_keystone:-package}
export DIB_INSTALLTYPE_neutron=${DIB_INSTALLTYPE_neutron:-package}
export DIB_INSTALLTYPE_glance=${DIB_INSTALLTYPE_glance:-package}
export DIB_INSTALLTYPE_swift=${DIB_INSTALLTYPE_swift:-package}
export DIB_INSTALLTYPE_cinder=${DIB_INSTALLTYPE_cinder:-package}
export DIB_INSTALLTYPE_ceilometer=${DIB_INSTALLTYPE_ceilometer:-package}
export DIB_INSTALLTYPE_ironic=${DIB_INSTALLTYPE_ironic:-package}
export DIB_INSTALLTYPE_nova=${DIB_INSTALLTYPE_nova:-package}
export DIB_INSTALLTYPE_horizon=${DIB_INSTALLTYPE_horizon:-package}
# Clients
export DIB_INSTALLTYPE_python_cinderclient=${DIB_INSTALLTYPE_python_cinderclient:-package}
export DIB_INSTALLTYPE_python_glanceclient=${DIB_INSTALLTYPE_python_glanceclient:-package}
export DIB_INSTALLTYPE_python_heatclient=${DIB_INSTALLTYPE_python_heatclient:-package}
export DIB_INSTALLTYPE_python_keystoneclient=${DIB_INSTALLTYPE_python_keystoneclient:-package}
export DIB_INSTALLTYPE_python_neutronclient=${DIB_INSTALLTYPE_python_neutronclient:-package}
export DIB_INSTALLTYPE_python_novaclient=${DIB_INSTALLTYPE_python_novaclient:-package}
export DIB_INSTALLTYPE_python_swiftclient=${DIB_INSTALLTYPE_python_swiftclient:-package}
export DIB_INSTALLTYPE_python_ceilometerclient=${DIB_INSTALLTYPE_python_ceilometerclient:-package}
export DIB_INSTALLTYPE_python_ironicclient=${DIB_INSTALLTYPE_python_ironicclient:-package}
export DIB_INSTALLTYPE_python_openstackclient=${DIB_INSTALLTYPE_python_openstackclient:-package}
# os-*-config
export DIB_INSTALLTYPE_os_collect_config=${DIB_INSTALLTYPE_os_collect_config:-package}
export DIB_INSTALLTYPE_os_refresh_config=${DIB_INSTALLTYPE_os_refresh_config:-package}
export DIB_INSTALLTYPE_os_apply_config=${DIB_INSTALLTYPE_os_apply_config:-package}
export DIB_INSTALLTYPE_os_net_config=${DIB_INSTALLTYPE_os_net_config:-package}
# TripleO
# Make the setting for tripleo-heat-templates overrideable for the source
# install. Can be removed when source install is removed.
export DIB_INSTALLTYPE_tripleo_heat_templates=${DIB_INSTALLTYPE_tripleo_heat_templates:-package}
# Miscellaneous
export DIB_INSTALLTYPE_get_pip_py=${DIB_INSTALLTYPE_get_pip_py:-package}
export DIB_INSTALLTYPE_novnc=${DIB_INSTALLTYPE_novnc:-package}
export DIB_INSTALLTYPE_ironic_discoverd=${DIB_INSTALLTYPE_ironic_discoverd:-package}
export DIB_INSTALLTYPE_heat_config=${DIB_INSTALLTYPE_heat_config:-package}

2
json-files/centos-7-undercloud-packages.json
View File

@ -10,7 +10,7 @@
"undercloud-stack-config",
"common-venv",
"undercloud-post-config",
"undercloud-package-install",
"enable-packages-install",
"element-manifest",
"ironic-conductor",
"ipxe",

2
json-files/rhel-7-undercloud-packages.json
View File

@ -10,7 +10,7 @@
"undercloud-stack-config",
"common-venv",
"undercloud-post-config",
"undercloud-package-install",
"enable-packages-install",
"element-manifest",
"ironic-conductor",
"ipxe",