From 7c4810e25bc18eff43a8c13fa112fc1e7017da73 Mon Sep 17 00:00:00 2001 From: Francesco Santoro Date: Thu, 7 Apr 2016 09:14:45 +0200 Subject: [PATCH] 6wind-va-plugin: use common 6WIND repo for openstack extensions Let's retrieve the 6WIND openstack extensions package directly from virtual accelerator repository and use the regular repo preference file instead of the embedded one. Change-Id: Ie0e00251a9772107b80a2f5fce8f3bf615ac3a3d Signed-off-by: Francesco Santoro --- .../puppet/manifests/6wind_repo.pp | 16 ++-------------- .../files/6wind-virtual-accelerator.pref | 3 --- 2 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 deployment_scripts/puppet/modules/virtual_accelerator/files/6wind-virtual-accelerator.pref diff --git a/deployment_scripts/puppet/manifests/6wind_repo.pp b/deployment_scripts/puppet/manifests/6wind_repo.pp index 8a829a1..6ecf79f 100644 --- a/deployment_scripts/puppet/manifests/6wind_repo.pp +++ b/deployment_scripts/puppet/manifests/6wind_repo.pp @@ -5,7 +5,6 @@ notice('MODULAR: virtual_accelerator/6wind_repo.pp') $settings = hiera('6wind-virtual-accelerator', {}) -$app_note_version = "1.2" $va_version = "1.3" $cred_package_content = $settings['credentials_package'][content] @@ -35,17 +34,6 @@ package { "6wind-virtual-accelerator-repository": ensure => 'installed', source => "/tmp/6wind-virtual-accelerator-repository.deb" } -> -exec { 'retrieve_app_note_repo': - command => "/usr/bin/curl --cacert /usr/local/etc/certs/6wind_ca.crt --key /usr/local/etc/certs/6wind_client.key --cert /usr/local/etc/certs/6wind_client.crt -o /tmp/6wind-openstack-extensions-repository.deb https://repo.6wind.com/openstack-extensions/ubuntu-14.04/all/${app_note_version}/6wind-openstack-extensions-ubuntu-14.04-repository_${app_note_version}-1_all.deb", -} -> -package { "6wind-openstack-extensions-repository": - provider => 'dpkg', - ensure => 'installed', - source => "/tmp/6wind-openstack-extensions-repository.deb" -} -> -file { '/etc/apt/preferences.d/6wind-virtual-accelerator.pref': - owner => 'root', - group => 'root', - mode => 0644, - source => 'puppet:///modules/virtual_accelerator/6wind-virtual-accelerator.pref', +exec { 'increase_repo_priority': + command => "/bin/sed -i 's#Pin-Priority: .*#Pin-Priority: 1100##' /etc/apt/preferences.d/6wind-virtual-accelerator", } diff --git a/deployment_scripts/puppet/modules/virtual_accelerator/files/6wind-virtual-accelerator.pref b/deployment_scripts/puppet/modules/virtual_accelerator/files/6wind-virtual-accelerator.pref deleted file mode 100644 index df48da7..0000000 --- a/deployment_scripts/puppet/modules/virtual_accelerator/files/6wind-virtual-accelerator.pref +++ /dev/null @@ -1,3 +0,0 @@ -Package: * -Pin: origin "repo.6wind.com" -Pin-Priority: 1100