openstack/tripleo-common
Code Issues Proposed changes

Merge "Install os-net-config as a package, not an element"

Browse Source
This commit is contained in:
Zuul 2018-01-31 14:39:37 +00:00 committed by Gerrit Code Review
commit 2c05492af9
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
image-yaml/overcloud-hardened-images.yaml
View File

@ -10,7 +10,6 @@ disk_images:
- overcloud-compute
- overcloud-ceph-storage
- puppet-modules
- os-net-config
- stable-interface-names
- bootloader
- element-manifest
@ -36,6 +35,7 @@ disk_images:
- python-heat-agent-docker-cmd
- python-heat-agent-json-file
- screen
- os-net-config
options:
- "--min-tmpfs=7"
environment:

2
image-yaml/overcloud-images.yaml
View File

@ -11,7 +11,6 @@ disk_images:
- overcloud-compute
- overcloud-ceph-storage
- puppet-modules
- os-net-config
- stable-interface-names
- grub2
- element-manifest
@ -29,6 +28,7 @@ disk_images:
- ntp
- device-mapper-multipath
- openstack-heat-agents
- os-net-config
options:
- "--min-tmpfs=7"
environment:

2
image-yaml/overcloud-odl-rhel7.yaml
View File

@ -10,7 +10,6 @@ disk_images:
- dhcp-all-interfaces
- os-collect-config
- puppet-modules
- os-net-config
- stable-interface-names
- grub2-deprecated
packages:
@ -23,4 +22,5 @@ disk_images:
- python-heat-agent-ansible
- python-heat-agent-docker-cmd
- python-heat-agent-json-file
- os-net-config
options:

17
releasenotes/notes/os_net_config_packaging-36b94a08bbb3e11d.yaml Normal file
View File

@ -0,0 +1,17 @@
---
features:
- |
Install os-net-config as an RPM package directly via DIB rather than
rely on the os-net-config element. This change will allow us to
deprecated further use of tripleo-image-elements for this feature.
upgrade:
- |
In the Ocata release we started using a tripleo-heat-templates script
to drive os-net-config. This approach gave us better signal handling
capabilities, reduces our dependencies on os-apply-config, and makes
it easier to integrate and fine tune network configuration with
for example custom mapping files. Users who have network scripts
using the older 'os-apply-config' format will need to update
to the new t-h-t script format as part of this change. All
in tree templates were updated in t-h-t as part of
git commit 2c11e9e179178d074af91d8c5c798078ac3e0966.