From 16aa7716ac2c0bbc652bfb45094cc88fca886675 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 5 Jan 2023 15:36:41 +0900 Subject: [PATCH] Remove unused exec resource to refresh network interfaces This resource was used to set up nova-network, which was already removed. Change-Id: Ia2adbe27d7a586176a3bcc8adadc2d952e541d03 --- manifests/compute.pp | 1 - manifests/init.pp | 7 ------- spec/classes/nova_init_spec.rb | 5 ----- 3 files changed, 13 deletions(-) diff --git a/manifests/compute.pp b/manifests/compute.pp index 341f49b54..ef25e86ff 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -440,7 +440,6 @@ class nova::compute ( package_name => $::nova::params::compute_package_name, service_name => $::nova::params::compute_service_name, ensure_package => $ensure_package, - before => Exec['networking-refresh'] } if $force_config_drive { diff --git a/manifests/init.pp b/manifests/init.pp index 6145b5f51..11b751db9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -542,13 +542,6 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.") tag => ['openstack', 'nova-package'], } - # used by debian/ubuntu in nova::network_bridge to refresh - # interfaces based on /etc/network/interfaces - exec { 'networking-refresh': - command => '/sbin/ifdown -a ; /sbin/ifup -a', - refreshonly => true, - } - resources { 'nova_config': purge => $purge_config, } diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb index 71bb4334a..f9f3de95f 100644 --- a/spec/classes/nova_init_spec.rb +++ b/spec/classes/nova_init_spec.rb @@ -25,11 +25,6 @@ describe 'nova' do is_expected.to contain_nova_config('DEFAULT/rootwrap_config').with_value('/etc/nova/rootwrap.conf') end - it { is_expected.to contain_exec('networking-refresh').with( - :command => '/sbin/ifdown -a ; /sbin/ifup -a', - :refreshonly => true - )} - it 'does not configure auth_strategy' do is_expected.to contain_nova_config('api/auth_strategy').with_value('') end