0c9b39baf1
Migrate as much as we're initially able to over to be installed via Puppet instead of elements from tripleo-image-elements. This change is rather large, but it's all more or less inter-dependent so I wasn't able to break it up any finer. The bulk of the change is a new element, puppet-stack-config. That element installs a puppet manifest at /etc/puppet/manifests/puppet-stack-config.pp that is applied via puppet during the os-refresh-config phase of the installation. When the manifest is applied, it uses a hiera data file from /etc/puppet/hieradata/puppet-stack-config.yaml as input. That file is generated from a template. The Puppet modules require a handful of additional inputs for password and secret items. These inputs are added to the instack.answers.sample file and instack-install-undercloud. We're able to remove many items from the static json we're writing out to /var/lib/heat-cfntools/cfn-init-data, but we still need this for some configuration as not everything is driven via a Puppet module (os-net-config) for instance. Also kemoves some particular hooks scripts that are no longer needed in instack-undercloud. This fix-undercloud-package-installs element is no longer needed. It's addressing bugs that have already been fixed. Change-Id: I9b93569f193c58d3e98063a1a90c3946a3a886db
77 lines
1.6 KiB
JSON
77 lines
1.6 KiB
JSON
[
|
|
{
|
|
"name": "Initialization",
|
|
"element": [
|
|
"base",
|
|
"dib-run-parts",
|
|
"rhel7-distro",
|
|
"undercloud-package-install"
|
|
],
|
|
"hook": [
|
|
"extra-data",
|
|
"root",
|
|
"pre-install"
|
|
],
|
|
"blacklist": [
|
|
"01-ccache"
|
|
]
|
|
},
|
|
{
|
|
"name": "Installation",
|
|
"element": [
|
|
"base",
|
|
"undercloud-install",
|
|
"rhel7",
|
|
"rhel7-distro",
|
|
"boot-stack",
|
|
"nova-ironic",
|
|
"os-collect-config",
|
|
"horizon",
|
|
"neutron-dhcp-agent",
|
|
"undercloud-stack-config",
|
|
"rabbitmq-server",
|
|
"mariadb-rpm",
|
|
"os-refresh-config-reboot",
|
|
"common-venv",
|
|
"undercloud-post-config",
|
|
"undercloud-package-install",
|
|
"ceilometer-collector",
|
|
"ceilometer-api",
|
|
"ceilometer-agent-central",
|
|
"ceilometer-agent-notification",
|
|
"ceilometer-undercloud-config",
|
|
"ironic-discoverd",
|
|
"element-manifest",
|
|
"os-cloud-config",
|
|
"install-server",
|
|
"selinux-permissive",
|
|
"selinux-setenforce-0",
|
|
"dnsmasq-forwarder"
|
|
],
|
|
"hook": [
|
|
"extra-data",
|
|
"pre-install",
|
|
"install",
|
|
"post-install"
|
|
],
|
|
"exclude-element": [
|
|
"dkms",
|
|
"openvswitch-datapath",
|
|
"pip-and-virtualenv"
|
|
],
|
|
"blacklist": [
|
|
"10-cloud-init",
|
|
"50-store-build-settings",
|
|
"99-dkms",
|
|
"99-up-to-date",
|
|
"01-yum-keepcache",
|
|
"15-remove-grub",
|
|
"05-fstab-rootfs-label",
|
|
"15-fedora-remove-grub",
|
|
"00-load-selinux-policy",
|
|
"00-install-and-load-selinux-policy",
|
|
"00-rhel-registration"
|
|
]
|
|
}
|
|
]
|