openstack/fuel-library
Code Issues Proposed changes

Merge "Remove repo settings if Ubuntu installer gets done"

Browse Source
This commit is contained in:
Jenkins 2015-04-02 21:12:43 +00:00 committed by Gerrit Code Review
commit 8a921d9494
5 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/puppet/cobbler/manifests/snippets.pp
View File

@ -70,6 +70,7 @@ class cobbler::snippets {
cobbler_snippet {"ubuntu_partition_late":}
cobbler_snippet {"ubuntu_static_net":}
cobbler_snippet {"ubuntu_repos_late":}
cobbler_snippet {"ubuntu_remove_repos_late":}
cobbler_snippet {"ubuntu_precise_packages_late":}
cobbler_snippet {"ubuntu_trusty_packages_late":}
cobbler_snippet {"anaconda_ssh_console":}

1
deployment/puppet/cobbler/templates/preseed/ubuntu-1204.preseed.erb
View File

@ -169,4 +169,5 @@ $SNIPPET('ubuntu_static_net')
$SNIPPET('ofed_install_with_sriov')
# Rsyslogd should send all messages to master node
$SNIPPET('target_logs_to_master_ubuntu')
$SNIPPET('ubuntu_remove_repos_late')
true

1
deployment/puppet/cobbler/templates/preseed/ubuntu-1404.preseed.erb
View File

@ -179,5 +179,6 @@ $SNIPPET('ubuntu_static_net')
$SNIPPET('ofed_install_with_sriov')
# Rsyslogd should send all messages to master node
$SNIPPET('target_logs_to_master_ubuntu')
$SNIPPET('ubuntu_remove_repos_late')
true

5
deployment/puppet/cobbler/templates/snippets/ubuntu_remove_repos_late.erb Normal file
View File

@ -0,0 +1,5 @@
## Cleaning up sources.list.d/ and preferences.d/
rm -f /target/etc/apt/sources.list; \
rm -f /target/etc/apt/sources.list.d/*; \
rm -f /target/etc/apt/preferences; \
rm -f /target/etc/apt/preferences.d/*; \

3
deployment/puppet/cobbler/templates/snippets/ubuntu_repos_late.erb
View File

@ -8,6 +8,9 @@ mkdir -p /target/etc/apt/preferences.d; \
#set $repos = $repo_setup["repos"]
#for $repo in $repos
echo 'deb $repo["uri"] $repo["suite"] $repo["section"]' > /target/etc/apt/sources.list.d/${repo["name"]}.list; \
#if not $repo.get("priority")
#continue
#end if
echo 'Package: *' > /target/etc/apt/preferences.d/$repo["name"]; \
echo 'Pin: release a=$repo["suite"]' >> /target/etc/apt/preferences.d/$repo["name"]; \
echo 'Pin-Priority: $repo["priority"]' >> /target/etc/apt/preferences.d/$repo["name"]; \