From 4661d17814c24577c407af2c39c7c59b5c00279b Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 4 May 2020 23:02:08 +0900 Subject: [PATCH] Use anchor to require necessary packages/services ... so that correct packages and services are required without re-defining them in resource implementations. Change-Id: I031ea1bf8722593f9d2e326bce16801910971f97 --- lib/puppet/type/eswitchd_config.rb | 4 +++- lib/puppet/type/ironic_neutron_agent_config.rb | 4 ++-- lib/puppet/type/neutron_agent_linuxbridge.rb | 4 ++-- lib/puppet/type/neutron_agent_ovs.rb | 4 ++-- lib/puppet/type/neutron_agent_vpp.rb | 4 ++-- lib/puppet/type/neutron_api_paste_ini.rb | 4 ++-- lib/puppet/type/neutron_bgp_dragent_config.rb | 4 ++-- lib/puppet/type/neutron_bgpvpn_bagpipe_config.rb | 4 ++-- lib/puppet/type/neutron_bgpvpn_service_config.rb | 4 +++- lib/puppet/type/neutron_config.rb | 4 ++-- lib/puppet/type/neutron_dhcp_agent_config.rb | 4 ++-- lib/puppet/type/neutron_fwaas_service_config.rb | 4 ++-- lib/puppet/type/neutron_l2gw_agent_config.rb | 6 +++--- lib/puppet/type/neutron_l2gw_service_config.rb | 4 ++-- lib/puppet/type/neutron_l3_agent_config.rb | 4 ++-- lib/puppet/type/neutron_l3_ovs_bridge.rb | 4 ++-- lib/puppet/type/neutron_metadata_agent_config.rb | 4 ++-- lib/puppet/type/neutron_metering_agent_config.rb | 4 ++-- lib/puppet/type/neutron_mlnx_agent_config.rb | 4 +++- lib/puppet/type/neutron_network.rb | 4 ++-- lib/puppet/type/neutron_plugin_cisco.rb | 4 ++-- lib/puppet/type/neutron_plugin_cisco_credentials.rb | 4 ++-- lib/puppet/type/neutron_plugin_cisco_db_conn.rb | 4 ++-- lib/puppet/type/neutron_plugin_cisco_l2network.rb | 4 ++-- lib/puppet/type/neutron_plugin_midonet.rb | 6 ++---- lib/puppet/type/neutron_plugin_ml2.rb | 4 ++-- lib/puppet/type/neutron_plugin_nsx.rb | 4 ++-- lib/puppet/type/neutron_plugin_nuage.rb | 4 ++-- lib/puppet/type/neutron_plugin_nvp.rb | 4 ++-- lib/puppet/type/neutron_plugin_opencontrail.rb | 4 ++-- lib/puppet/type/neutron_plugin_plumgrid.rb | 4 ++-- lib/puppet/type/neutron_plugin_sriov.rb | 4 +++- lib/puppet/type/neutron_plumlib_plumgrid.rb | 4 ++-- lib/puppet/type/neutron_port.rb | 4 ++-- lib/puppet/type/neutron_rootwrap_config.rb | 4 ++-- lib/puppet/type/neutron_router.rb | 4 ++-- lib/puppet/type/neutron_router_interface.rb | 4 ++-- lib/puppet/type/neutron_security_group.rb | 4 ++-- lib/puppet/type/neutron_sfc_service_config.rb | 4 +++- lib/puppet/type/neutron_sriov_agent_config.rb | 4 +++- lib/puppet/type/neutron_subnet.rb | 4 ++-- lib/puppet/type/neutron_vpnaas_agent_config.rb | 4 ++-- lib/puppet/type/neutron_vpnaas_service_config.rb | 4 ++-- lib/puppet/type/ovn_metadata_agent_config.rb | 4 ++-- manifests/agents/bigswitch.pp | 2 +- manifests/plugins/midonet.pp | 2 +- manifests/plugins/ml2.pp | 2 +- manifests/plugins/nvp.pp | 2 +- manifests/plugins/opencontrail.pp | 2 +- manifests/services/fwaas.pp | 6 +++--- manifests/services/l2gw.pp | 2 +- spec/classes/neutron_agents_bigswitch.rb | 2 +- spec/classes/neutron_plugins_ml2_spec.rb | 4 ++-- spec/classes/neutron_plugins_nvp_spec.rb | 2 +- spec/classes/neutron_services_fwaas_spec.rb | 6 +++--- spec/unit/type/ironic_neutron_agent_config_spec.rb | 6 +++--- spec/unit/type/neutron_agent_linuxbridge_spec.rb | 6 +++--- spec/unit/type/neutron_agent_ovs_spec.rb | 6 +++--- spec/unit/type/neutron_agent_vpp_spec.rb | 6 +++--- spec/unit/type/neutron_api_paste_ini_spec.rb | 6 +++--- spec/unit/type/neutron_bgp_dragent_config_spec.rb | 11 ++++------- spec/unit/type/neutron_bgpvpn_bagpipe_config_spec.rb | 6 +++--- spec/unit/type/neutron_bgpvpn_service_config_spec.rb | 6 +++--- spec/unit/type/neutron_config_spec.rb | 6 +++--- spec/unit/type/neutron_dhcp_agent_config_spec.rb | 6 +++--- spec/unit/type/neutron_fwaas_service_config_spec.rb | 6 +++--- spec/unit/type/neutron_l2gw_agent_config_spec.rb | 6 +++--- spec/unit/type/neutron_l2gw_service_config_spec.rb | 6 +++--- spec/unit/type/neutron_l3_agent_config_spec.rb | 6 +++--- spec/unit/type/neutron_metadata_agent_config_spec.rb | 6 +++--- spec/unit/type/neutron_metering_agent_config_spec.rb | 11 ++++------- .../type/neutron_plugin_cisco_credentials_spec.rb | 6 +++--- spec/unit/type/neutron_plugin_cisco_db_conn_spec.rb | 6 +++--- spec/unit/type/neutron_plugin_cisco_l2network_spec.rb | 6 +++--- spec/unit/type/neutron_plugin_cisco_spec.rb | 6 +++--- spec/unit/type/neutron_plugin_midonet_spec.rb | 6 +++--- spec/unit/type/neutron_plugin_ml2_spec.rb | 6 +++--- spec/unit/type/neutron_plugin_nsx_spec.rb | 6 +++--- spec/unit/type/neutron_plugin_nvp_spec.rb | 6 +++--- spec/unit/type/neutron_plugin_opencontrail_spec.rb | 6 +++--- spec/unit/type/neutron_plugin_plumgrid_spec.rb | 6 +++--- spec/unit/type/neutron_plumlib_plumgrid_spec.rb | 6 +++--- spec/unit/type/neutron_rootwrap_config_spec.rb | 6 +++--- spec/unit/type/neutron_sfc_service_config_spec.rb | 6 +++--- spec/unit/type/neutron_vpnaas_agent_config_spec.rb | 11 ++++------- spec/unit/type/ovn_metadata_agent_config_spec.rb | 6 +++--- 86 files changed, 207 insertions(+), 206 deletions(-) diff --git a/lib/puppet/type/eswitchd_config.rb b/lib/puppet/type/eswitchd_config.rb index 07d7e0e5d..c98c84335 100644 --- a/lib/puppet/type/eswitchd_config.rb +++ b/lib/puppet/type/eswitchd_config.rb @@ -12,7 +12,9 @@ Puppet::Type.newtype(:eswitchd_config) do defaultto('') end - autorequire(:package) do ['neutron'] end + autorequire(:anchor) do + ['neutron::install::end'] + end newproperty(:value) do desc 'The value of the setting to be defined.' diff --git a/lib/puppet/type/ironic_neutron_agent_config.rb b/lib/puppet/type/ironic_neutron_agent_config.rb index 23798cc0c..f9fe1a5cf 100644 --- a/lib/puppet/type/ironic_neutron_agent_config.rb +++ b/lib/puppet/type/ironic_neutron_agent_config.rb @@ -21,8 +21,8 @@ Puppet::Type.newtype(:ironic_neutron_agent_config) do defaultto('') end - autorequire(:package) do - 'python2-ironic-neutron-agent' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_agent_linuxbridge.rb b/lib/puppet/type/neutron_agent_linuxbridge.rb index 5e75bbf38..76614870e 100644 --- a/lib/puppet/type/neutron_agent_linuxbridge.rb +++ b/lib/puppet/type/neutron_agent_linuxbridge.rb @@ -21,8 +21,8 @@ Puppet::Type.newtype(:neutron_agent_linuxbridge) do defaultto('') end - autorequire(:package) do - 'neutron-plugin-linuxbridge-agent' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_agent_ovs.rb b/lib/puppet/type/neutron_agent_ovs.rb index df4e4c98b..36fe9fc76 100644 --- a/lib/puppet/type/neutron_agent_ovs.rb +++ b/lib/puppet/type/neutron_agent_ovs.rb @@ -21,8 +21,8 @@ Puppet::Type.newtype(:neutron_agent_ovs) do defaultto('') end - autorequire(:package) do - 'neutron-ovs-agent' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_agent_vpp.rb b/lib/puppet/type/neutron_agent_vpp.rb index 0718db816..162346495 100644 --- a/lib/puppet/type/neutron_agent_vpp.rb +++ b/lib/puppet/type/neutron_agent_vpp.rb @@ -21,8 +21,8 @@ Puppet::Type.newtype(:neutron_agent_vpp) do defaultto('') end - autorequire(:package) do - 'neutron-vpp-agent' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_api_paste_ini.rb b/lib/puppet/type/neutron_api_paste_ini.rb index 514b62425..97f7f0d35 100644 --- a/lib/puppet/type/neutron_api_paste_ini.rb +++ b/lib/puppet/type/neutron_api_paste_ini.rb @@ -45,8 +45,8 @@ Puppet::Type.newtype(:neutron_api_paste_ini) do defaultto('') end - autorequire(:package) do - 'neutron' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_bgp_dragent_config.rb b/lib/puppet/type/neutron_bgp_dragent_config.rb index 058e93420..f16fd965b 100644 --- a/lib/puppet/type/neutron_bgp_dragent_config.rb +++ b/lib/puppet/type/neutron_bgp_dragent_config.rb @@ -21,8 +21,8 @@ Puppet::Type.newtype(:neutron_bgp_dragent_config) do defaultto('') end - autorequire(:package) do - ['neutron-dynamic-routing', 'neutron-bgp-dragent'] + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_bgpvpn_bagpipe_config.rb b/lib/puppet/type/neutron_bgpvpn_bagpipe_config.rb index cb74a7f99..b51307569 100644 --- a/lib/puppet/type/neutron_bgpvpn_bagpipe_config.rb +++ b/lib/puppet/type/neutron_bgpvpn_bagpipe_config.rb @@ -21,8 +21,8 @@ Puppet::Type.newtype(:neutron_bgpvpn_bagpipe_config) do defaultto('') end - autorequire(:package) do - ['openstack-bagpipe-bgp'] + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_bgpvpn_service_config.rb b/lib/puppet/type/neutron_bgpvpn_service_config.rb index f3496ae1c..8623a049a 100644 --- a/lib/puppet/type/neutron_bgpvpn_service_config.rb +++ b/lib/puppet/type/neutron_bgpvpn_service_config.rb @@ -31,6 +31,8 @@ Puppet::Type.newtype(:neutron_bgpvpn_service_config) do defaultto('') end - autorequire(:package) do ['python-networking-bgpvpn'] end + autorequire(:anchor) do + ['neutron::install::end'] + end end diff --git a/lib/puppet/type/neutron_config.rb b/lib/puppet/type/neutron_config.rb index 5c76fc478..b73791558 100644 --- a/lib/puppet/type/neutron_config.rb +++ b/lib/puppet/type/neutron_config.rb @@ -61,8 +61,8 @@ Puppet::Type.newtype(:neutron_config) do provider.create end - autorequire(:package) do - 'neutron' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_dhcp_agent_config.rb b/lib/puppet/type/neutron_dhcp_agent_config.rb index befc01873..0c4501a31 100644 --- a/lib/puppet/type/neutron_dhcp_agent_config.rb +++ b/lib/puppet/type/neutron_dhcp_agent_config.rb @@ -21,8 +21,8 @@ Puppet::Type.newtype(:neutron_dhcp_agent_config) do defaultto('') end - autorequire(:package) do - 'neutron' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_fwaas_service_config.rb b/lib/puppet/type/neutron_fwaas_service_config.rb index 1d60c7e18..1159f0b36 100644 --- a/lib/puppet/type/neutron_fwaas_service_config.rb +++ b/lib/puppet/type/neutron_fwaas_service_config.rb @@ -21,8 +21,8 @@ Puppet::Type.newtype(:neutron_fwaas_service_config) do defaultto('') end - autorequire(:package) do - 'neutron-fwaas' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_l2gw_agent_config.rb b/lib/puppet/type/neutron_l2gw_agent_config.rb index ecd569233..4cf579a2d 100644 --- a/lib/puppet/type/neutron_l2gw_agent_config.rb +++ b/lib/puppet/type/neutron_l2gw_agent_config.rb @@ -21,8 +21,8 @@ Puppet::Type.newtype(:neutron_l2gw_agent_config) do defaultto('') end - autorequire(:package) do - ['neutron-l2gw-agent'] + autorequire(:anchor) do + ['neutron::install::end'] end -end \ No newline at end of file +end diff --git a/lib/puppet/type/neutron_l2gw_service_config.rb b/lib/puppet/type/neutron_l2gw_service_config.rb index df528fb69..069f37b3e 100644 --- a/lib/puppet/type/neutron_l2gw_service_config.rb +++ b/lib/puppet/type/neutron_l2gw_service_config.rb @@ -31,8 +31,8 @@ Puppet::Type.newtype(:neutron_l2gw_service_config) do defaultto('') end - autorequire(:package) do - ['python-networking-l2gw'] + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_l3_agent_config.rb b/lib/puppet/type/neutron_l3_agent_config.rb index a1569c579..666f4c1db 100644 --- a/lib/puppet/type/neutron_l3_agent_config.rb +++ b/lib/puppet/type/neutron_l3_agent_config.rb @@ -23,8 +23,8 @@ Puppet::Type.newtype(:neutron_l3_agent_config) do newparam(:transform_to) - autorequire(:package) do - 'neutron' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_l3_ovs_bridge.rb b/lib/puppet/type/neutron_l3_ovs_bridge.rb index f7608c9fb..72221b9cd 100644 --- a/lib/puppet/type/neutron_l3_ovs_bridge.rb +++ b/lib/puppet/type/neutron_l3_ovs_bridge.rb @@ -11,8 +11,8 @@ Puppet::Type.newtype(:neutron_l3_ovs_bridge) do desc 'Name of the subnet that will use the bridge as gateway' end - autorequire(:service) do - ['neutron-server'] + autorequire(:anchor) do + ['neutron::service::end'] end autorequire(:vs_bridge) do diff --git a/lib/puppet/type/neutron_metadata_agent_config.rb b/lib/puppet/type/neutron_metadata_agent_config.rb index b7034b2e3..401374b0f 100644 --- a/lib/puppet/type/neutron_metadata_agent_config.rb +++ b/lib/puppet/type/neutron_metadata_agent_config.rb @@ -45,8 +45,8 @@ Puppet::Type.newtype(:neutron_metadata_agent_config) do defaultto('') end - autorequire(:package) do - 'neutron' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_metering_agent_config.rb b/lib/puppet/type/neutron_metering_agent_config.rb index 8a526be0b..2d40d4f23 100644 --- a/lib/puppet/type/neutron_metering_agent_config.rb +++ b/lib/puppet/type/neutron_metering_agent_config.rb @@ -21,8 +21,8 @@ Puppet::Type.newtype(:neutron_metering_agent_config) do defaultto('') end - autorequire(:package) do - ['neutron', 'neutron-metering-agent'] + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_mlnx_agent_config.rb b/lib/puppet/type/neutron_mlnx_agent_config.rb index 3bbb476ee..ca6593c6c 100644 --- a/lib/puppet/type/neutron_mlnx_agent_config.rb +++ b/lib/puppet/type/neutron_mlnx_agent_config.rb @@ -12,7 +12,9 @@ Puppet::Type.newtype(:neutron_mlnx_agent_config) do defaultto('') end - autorequire(:package) do ['neutron'] end + autorequire(:anchor) do + ['neutron::install::end'] + end newproperty(:value) do desc 'The value of the setting to be defined.' diff --git a/lib/puppet/type/neutron_network.rb b/lib/puppet/type/neutron_network.rb index 0031246d8..650b1622c 100644 --- a/lib/puppet/type/neutron_network.rb +++ b/lib/puppet/type/neutron_network.rb @@ -74,8 +74,8 @@ Puppet::Type.newtype(:neutron_network) do end # Require the neutron-server service to be running - autorequire(:service) do - ['neutron-server'] + autorequire(:anchor) do + ['neutron::service::end'] end autorequire(:keystone_tenant) do diff --git a/lib/puppet/type/neutron_plugin_cisco.rb b/lib/puppet/type/neutron_plugin_cisco.rb index b7a85ae90..1f0254c18 100644 --- a/lib/puppet/type/neutron_plugin_cisco.rb +++ b/lib/puppet/type/neutron_plugin_cisco.rb @@ -49,8 +49,8 @@ Puppet::Type.newtype(:neutron_plugin_cisco) do ['/etc/neutron/plugins/cisco'] end - autorequire(:package) do - 'neutron-plugin-cisco' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_plugin_cisco_credentials.rb b/lib/puppet/type/neutron_plugin_cisco_credentials.rb index aaa4143c2..fdb2be94e 100644 --- a/lib/puppet/type/neutron_plugin_cisco_credentials.rb +++ b/lib/puppet/type/neutron_plugin_cisco_credentials.rb @@ -50,8 +50,8 @@ Puppet::Type.newtype(:neutron_plugin_cisco_credentials) do ['/etc/neutron/plugins/cisco'] end - autorequire(:package) do - 'neutron-plugin-cisco' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_plugin_cisco_db_conn.rb b/lib/puppet/type/neutron_plugin_cisco_db_conn.rb index 6c94cb24f..910fcb704 100644 --- a/lib/puppet/type/neutron_plugin_cisco_db_conn.rb +++ b/lib/puppet/type/neutron_plugin_cisco_db_conn.rb @@ -25,8 +25,8 @@ Puppet::Type.newtype(:neutron_plugin_cisco_db_conn) do ['/etc/neutron/plugins/cisco'] end - autorequire(:package) do - 'neutron-plugin-cisco' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_plugin_cisco_l2network.rb b/lib/puppet/type/neutron_plugin_cisco_l2network.rb index bba6fb036..96149e15d 100644 --- a/lib/puppet/type/neutron_plugin_cisco_l2network.rb +++ b/lib/puppet/type/neutron_plugin_cisco_l2network.rb @@ -25,8 +25,8 @@ Puppet::Type.newtype(:neutron_plugin_cisco_l2network) do ['/etc/neutron/plugins/cisco'] end - autorequire(:package) do - 'neutron-plugin-cisco' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_plugin_midonet.rb b/lib/puppet/type/neutron_plugin_midonet.rb index d98abf0ee..999eb9869 100644 --- a/lib/puppet/type/neutron_plugin_midonet.rb +++ b/lib/puppet/type/neutron_plugin_midonet.rb @@ -7,8 +7,6 @@ Puppet::Type.newtype(:neutron_plugin_midonet) do newvalues(/\S+\/\S+/) end - autorequire(:package) do ['neutron'] end - newproperty(:value) do desc 'The value of the setting to be defined.' munge do |value| @@ -51,8 +49,8 @@ Puppet::Type.newtype(:neutron_plugin_midonet) do ['/etc/neutron/plugins/midonet'] end - autorequire(:package) do - 'python-networking-midonet' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_plugin_ml2.rb b/lib/puppet/type/neutron_plugin_ml2.rb index fd2da376f..efc0599e5 100644 --- a/lib/puppet/type/neutron_plugin_ml2.rb +++ b/lib/puppet/type/neutron_plugin_ml2.rb @@ -43,8 +43,8 @@ Puppet::Type.newtype(:neutron_plugin_ml2) do defaultto('') end - autorequire(:package) do - ['neutron', 'neutron-plugin-ml2'] + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_plugin_nsx.rb b/lib/puppet/type/neutron_plugin_nsx.rb index f6dd95d44..b12f90f3c 100644 --- a/lib/puppet/type/neutron_plugin_nsx.rb +++ b/lib/puppet/type/neutron_plugin_nsx.rb @@ -49,8 +49,8 @@ Puppet::Type.newtype(:neutron_plugin_nsx) do '/etc/neutron/plugins/vmware' end - autorequire(:package) do - 'vmware-nsx' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_plugin_nuage.rb b/lib/puppet/type/neutron_plugin_nuage.rb index c09789925..bd61d3be9 100644 --- a/lib/puppet/type/neutron_plugin_nuage.rb +++ b/lib/puppet/type/neutron_plugin_nuage.rb @@ -21,8 +21,8 @@ Puppet::Type.newtype(:neutron_plugin_nuage) do defaultto('') end - autorequire(:package) do - 'neutron-plugin-nuage' + autorequire(:anchor) do + ['neutron::install::end'] end autorequire(:file) do diff --git a/lib/puppet/type/neutron_plugin_nvp.rb b/lib/puppet/type/neutron_plugin_nvp.rb index 0bef0709d..ac5065a03 100644 --- a/lib/puppet/type/neutron_plugin_nvp.rb +++ b/lib/puppet/type/neutron_plugin_nvp.rb @@ -45,8 +45,8 @@ Puppet::Type.newtype(:neutron_plugin_nvp) do defaultto('') end - autorequire(:package) do - 'neutron-plugin-nvp' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_plugin_opencontrail.rb b/lib/puppet/type/neutron_plugin_opencontrail.rb index b4e7bc6af..d8c1dcd3a 100644 --- a/lib/puppet/type/neutron_plugin_opencontrail.rb +++ b/lib/puppet/type/neutron_plugin_opencontrail.rb @@ -49,8 +49,8 @@ Puppet::Type.newtype(:neutron_plugin_opencontrail) do ['/etc/neutron/plugins/opencontrail'] end - autorequire(:package) do - 'neutron-plugin-opencontrail' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_plugin_plumgrid.rb b/lib/puppet/type/neutron_plugin_plumgrid.rb index d1d4b46a4..0bb445fc0 100644 --- a/lib/puppet/type/neutron_plugin_plumgrid.rb +++ b/lib/puppet/type/neutron_plugin_plumgrid.rb @@ -49,8 +49,8 @@ Puppet::Type.newtype(:neutron_plugin_plumgrid) do ['/etc/neutron/plugins/plumgrid'] end - autorequire(:package) do - 'neutron-plugin-plumgrid' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_plugin_sriov.rb b/lib/puppet/type/neutron_plugin_sriov.rb index 55e0e88c6..de7f8ac57 100644 --- a/lib/puppet/type/neutron_plugin_sriov.rb +++ b/lib/puppet/type/neutron_plugin_sriov.rb @@ -12,7 +12,9 @@ Puppet::Type.newtype(:neutron_plugin_sriov) do defaultto('') end - autorequire(:package) do ['neutron'] end + autorequire(:anchor) do + ['neutron::install::end'] + end newproperty(:value) do desc 'The value of the setting to be defined.' diff --git a/lib/puppet/type/neutron_plumlib_plumgrid.rb b/lib/puppet/type/neutron_plumlib_plumgrid.rb index 5109a9f0e..4871475ca 100644 --- a/lib/puppet/type/neutron_plumlib_plumgrid.rb +++ b/lib/puppet/type/neutron_plumlib_plumgrid.rb @@ -49,8 +49,8 @@ Puppet::Type.newtype(:neutron_plumlib_plumgrid) do ['/etc/neutron/plugins/plumgrid'] end - autorequire(:package) do - 'neutron-plumlib-plumgrid' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_port.rb b/lib/puppet/type/neutron_port.rb index 41bda3c47..60e090205 100644 --- a/lib/puppet/type/neutron_port.rb +++ b/lib/puppet/type/neutron_port.rb @@ -88,8 +88,8 @@ Puppet::Type.newtype(:neutron_port) do end end - autorequire(:service) do - ['neutron-server'] + autorequire(:anchor) do + ['neutron::service::end'] end autorequire(:keystone_tenant) do diff --git a/lib/puppet/type/neutron_rootwrap_config.rb b/lib/puppet/type/neutron_rootwrap_config.rb index efbd3a741..e9f70da78 100644 --- a/lib/puppet/type/neutron_rootwrap_config.rb +++ b/lib/puppet/type/neutron_rootwrap_config.rb @@ -21,8 +21,8 @@ Puppet::Type.newtype(:neutron_rootwrap_config) do defaultto('') end - autorequire(:package) do - 'neutron-common' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_router.rb b/lib/puppet/type/neutron_router.rb index a85d03a41..c9c21054b 100644 --- a/lib/puppet/type/neutron_router.rb +++ b/lib/puppet/type/neutron_router.rb @@ -64,8 +64,8 @@ Puppet::Type.newtype(:neutron_router) do desc 'A uuid identifying the tenant which will own the router.' end - autorequire(:service) do - ['neutron-server'] + autorequire(:anchor) do + ['neutron::service::end'] end autorequire(:keystone_tenant) do diff --git a/lib/puppet/type/neutron_router_interface.rb b/lib/puppet/type/neutron_router_interface.rb index f51695be7..7a1f019e0 100644 --- a/lib/puppet/type/neutron_router_interface.rb +++ b/lib/puppet/type/neutron_router_interface.rb @@ -44,8 +44,8 @@ Puppet::Type.newtype(:neutron_router_interface) do desc 'An existing neutron port to which a router interface should be assigned' end - autorequire(:service) do - ['neutron-server'] + autorequire(:anchor) do + ['neutron::service::end'] end autorequire(:neutron_router) do diff --git a/lib/puppet/type/neutron_security_group.rb b/lib/puppet/type/neutron_security_group.rb index 2dba66ffc..ab4994931 100644 --- a/lib/puppet/type/neutron_security_group.rb +++ b/lib/puppet/type/neutron_security_group.rb @@ -34,8 +34,8 @@ Puppet::Type.newtype(:neutron_security_group) do end # Require the neutron-server service to be running - autorequire(:service) do - ['neutron-server'] + autorequire(:anchor) do + ['neutron::service::end'] end newparam(:name, :namevar => true) do diff --git a/lib/puppet/type/neutron_sfc_service_config.rb b/lib/puppet/type/neutron_sfc_service_config.rb index b012c8751..8d246be6f 100644 --- a/lib/puppet/type/neutron_sfc_service_config.rb +++ b/lib/puppet/type/neutron_sfc_service_config.rb @@ -31,6 +31,8 @@ Puppet::Type.newtype(:neutron_sfc_service_config) do defaultto('') end - autorequire(:package) do ['python-networking-sfc'] end + autorequire(:anchor) do + ['neutron::install::end'] + end end diff --git a/lib/puppet/type/neutron_sriov_agent_config.rb b/lib/puppet/type/neutron_sriov_agent_config.rb index b110db73c..c2220a199 100644 --- a/lib/puppet/type/neutron_sriov_agent_config.rb +++ b/lib/puppet/type/neutron_sriov_agent_config.rb @@ -12,7 +12,9 @@ Puppet::Type.newtype(:neutron_sriov_agent_config) do defaultto('') end - autorequire(:package) do ['neutron'] end + autorequire(:anchor) do + ['neutron::install::end'] + end newproperty(:value) do desc 'The value of the setting to be defined.' diff --git a/lib/puppet/type/neutron_subnet.rb b/lib/puppet/type/neutron_subnet.rb index cef880a01..915501e81 100644 --- a/lib/puppet/type/neutron_subnet.rb +++ b/lib/puppet/type/neutron_subnet.rb @@ -88,8 +88,8 @@ Puppet::Type.newtype(:neutron_subnet) do desc 'A uuid identifying the tenant which will own the subnet.' end - autorequire(:service) do - ['neutron-server'] + autorequire(:anchor) do + ['neutron::service::end'] end autorequire(:keystone_tenant) do diff --git a/lib/puppet/type/neutron_vpnaas_agent_config.rb b/lib/puppet/type/neutron_vpnaas_agent_config.rb index 4e56da3f0..9cba758ae 100644 --- a/lib/puppet/type/neutron_vpnaas_agent_config.rb +++ b/lib/puppet/type/neutron_vpnaas_agent_config.rb @@ -21,8 +21,8 @@ Puppet::Type.newtype(:neutron_vpnaas_agent_config) do defaultto('') end - autorequire(:package) do - ['neutron', 'neutron-vpnaas-agent'] + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/neutron_vpnaas_service_config.rb b/lib/puppet/type/neutron_vpnaas_service_config.rb index b68189849..28dd3f97c 100644 --- a/lib/puppet/type/neutron_vpnaas_service_config.rb +++ b/lib/puppet/type/neutron_vpnaas_service_config.rb @@ -33,8 +33,8 @@ Puppet::Type.newtype(:neutron_vpnaas_service_config) do defaultto('') end - autorequire(:package) do - 'neutron-vpnaas-agent' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/lib/puppet/type/ovn_metadata_agent_config.rb b/lib/puppet/type/ovn_metadata_agent_config.rb index 36e01b415..40b7e8811 100644 --- a/lib/puppet/type/ovn_metadata_agent_config.rb +++ b/lib/puppet/type/ovn_metadata_agent_config.rb @@ -45,8 +45,8 @@ Puppet::Type.newtype(:ovn_metadata_agent_config) do defaultto('') end - autorequire(:package) do - 'python-networking-ovn-metadata-agent' + autorequire(:anchor) do + ['neutron::install::end'] end end diff --git a/manifests/agents/bigswitch.pp b/manifests/agents/bigswitch.pp index ae198cdcc..0e280cf6f 100644 --- a/manifests/agents/bigswitch.pp +++ b/manifests/agents/bigswitch.pp @@ -33,7 +33,7 @@ class neutron::agents::bigswitch ( ensure_packages("python${neutron::params::pyvers}-networking-bigswitch", { ensure => $package_ensure, - tag => 'openstack', + tag => ['openstack', 'neutron-package'], } ) diff --git a/manifests/plugins/midonet.pp b/manifests/plugins/midonet.pp index d212c7993..611f79a6e 100644 --- a/manifests/plugins/midonet.pp +++ b/manifests/plugins/midonet.pp @@ -142,7 +142,7 @@ class neutron::plugins::midonet ( package { 'python-networking-midonet': ensure => $package_ensure, name => $::neutron::params::midonet_server_package, - tag => ['neutron-package', 'openstack'], + tag => ['openstack', 'neutron-package'], } neutron_plugin_midonet { diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp index a132c1883..a033780bf 100644 --- a/manifests/plugins/ml2.pp +++ b/manifests/plugins/ml2.pp @@ -193,7 +193,7 @@ class neutron::plugins::ml2 ( package { 'neutron-plugin-ml2': ensure => $package_ensure, name => $::neutron::params::ml2_server_package, - tag => ['neutron-package', 'openstack'], + tag => ['openstack', 'neutron-package'], } } diff --git a/manifests/plugins/nvp.pp b/manifests/plugins/nvp.pp index 0d7df5a71..af965db3b 100644 --- a/manifests/plugins/nvp.pp +++ b/manifests/plugins/nvp.pp @@ -48,7 +48,7 @@ class neutron::plugins::nvp ( package { 'neutron-plugin-nvp': ensure => $package_ensure, name => $::neutron::params::nvp_server_package, - tag => ['neutron-package', 'openstack'], + tag => ['openstack', 'neutron-package'], } validate_legacy(Array, 'validate_array', $nvp_controllers) diff --git a/manifests/plugins/opencontrail.pp b/manifests/plugins/opencontrail.pp index 81108484f..bf196d803 100644 --- a/manifests/plugins/opencontrail.pp +++ b/manifests/plugins/opencontrail.pp @@ -74,7 +74,7 @@ class neutron::plugins::opencontrail ( package { 'neutron-plugin-contrail': ensure => $package_ensure, name => $::neutron::params::opencontrail_plugin_package, - tag => ['neutron-package', 'openstack'], + tag => ['openstack', 'neutron-package'], } ensure_resource('file', '/etc/neutron/plugins/opencontrail', { diff --git a/manifests/services/fwaas.pp b/manifests/services/fwaas.pp index e6b9d5d8f..851681537 100644 --- a/manifests/services/fwaas.pp +++ b/manifests/services/fwaas.pp @@ -63,14 +63,14 @@ class neutron::services::fwaas ( ensure_resource( 'package', 'neutron-vpn-agent', { 'name' => $::neutron::params::vpnaas_agent_package, 'ensure' => $neutron::package_ensure, - 'tag' => ['neutron-package', 'openstack'], + 'tag' => ['openstack', 'neutron-package'], }) } else { ensure_resource( 'package', 'neutron-fwaas' , { 'name' => $::neutron::params::fwaas_package, 'ensure' => $neutron::package_ensure, - 'tag' => ['neutron-package', 'openstack'], + 'tag' => ['openstack', 'neutron-package'], }) } } elsif($::osfamily == 'Redhat') { @@ -78,7 +78,7 @@ class neutron::services::fwaas ( ensure_resource( 'package', 'neutron-fwaas', { 'name' => $::neutron::params::fwaas_package, 'ensure' => $neutron::package_ensure, - 'tag' => ['neutron-package', 'openstack'], + 'tag' => ['openstack', 'neutron-package'], }) } diff --git a/manifests/services/l2gw.pp b/manifests/services/l2gw.pp index f2e33892a..224b90e0a 100644 --- a/manifests/services/l2gw.pp +++ b/manifests/services/l2gw.pp @@ -63,7 +63,7 @@ class neutron::services::l2gw ( ensure_resource( 'package', 'python-networking-l2gw', { 'ensure' => $package_ensure, 'name' => $::neutron::params::l2gw_package, - 'tag' => ['neutron-package', 'openstack'], + 'tag' => ['openstack', 'neutron-package'], }) resources { 'neutron_l2gw_service_config': diff --git a/spec/classes/neutron_agents_bigswitch.rb b/spec/classes/neutron_agents_bigswitch.rb index e2d5de0d0..512ec8367 100644 --- a/spec/classes/neutron_agents_bigswitch.rb +++ b/spec/classes/neutron_agents_bigswitch.rb @@ -10,7 +10,7 @@ describe 'neutron::agents::bigswitch' do it 'should have' do should contain_package('python-networking-bigswitch').with( :ensure => 'present', - :tag => 'openstack' + :tag => ['openstack', 'neutron-package'], ) end end diff --git a/spec/classes/neutron_plugins_ml2_spec.rb b/spec/classes/neutron_plugins_ml2_spec.rb index d01af47b2..1b3ab673b 100644 --- a/spec/classes/neutron_plugins_ml2_spec.rb +++ b/spec/classes/neutron_plugins_ml2_spec.rb @@ -89,7 +89,7 @@ describe 'neutron::plugins::ml2' do should contain_package('neutron-plugin-ml2').with( :name => platform_params[:ml2_server_package], :ensure => p[:package_ensure], - :tag => ['neutron-package', 'openstack'], + :tag => ['openstack', 'neutron-package'], ) should contain_package('neutron-plugin-ml2').that_requires('Anchor[neutron::install::begin]') should contain_package('neutron-plugin-ml2').that_notifies('Anchor[neutron::install::end]') @@ -274,7 +274,7 @@ describe 'neutron::plugins::ml2' do should contain_package('neutron-plugin-ml2').with( :name => platform_params[:ml2_server_package], :ensure => params[:package_ensure], - :tag => ['neutron-package', 'openstack'], + :tag => ['openstack', 'neutron-package'], ) end end diff --git a/spec/classes/neutron_plugins_nvp_spec.rb b/spec/classes/neutron_plugins_nvp_spec.rb index a3703b77c..fe250c3cd 100644 --- a/spec/classes/neutron_plugins_nvp_spec.rb +++ b/spec/classes/neutron_plugins_nvp_spec.rb @@ -41,7 +41,7 @@ describe 'neutron::plugins::nvp' do should contain_package('neutron-plugin-nvp').with( :name => platform_params[:nvp_server_package], :ensure => p[:package_ensure], - :tag => ['neutron-package', 'openstack'], + :tag => ['openstack', 'neutron-package'], ) end diff --git a/spec/classes/neutron_services_fwaas_spec.rb b/spec/classes/neutron_services_fwaas_spec.rb index e11051019..bf5bdb67d 100644 --- a/spec/classes/neutron_services_fwaas_spec.rb +++ b/spec/classes/neutron_services_fwaas_spec.rb @@ -65,7 +65,7 @@ describe 'neutron::services::fwaas' do it 'installs neutron fwaas package' do should contain_package('neutron-fwaas').with( :ensure => 'present', - :tag => ['neutron-package', 'openstack'], + :tag => ['openstack', 'neutron-package'], :name => platform_params[:fwaas_package_name], ) end @@ -76,7 +76,7 @@ describe 'neutron::services::fwaas' do it 'installs neutron fwaas package' do should contain_package('neutron-fwaas').with( :ensure => 'present', - :tag => ['neutron-package', 'openstack'], + :tag => ['openstack', 'neutron-package'], :name => platform_params[:fwaas_package_name], ) end @@ -91,7 +91,7 @@ describe 'neutron::services::fwaas' do should contain_package('neutron-vpn-agent').with( :ensure => 'present', :name => platform_params[:vpnaas_package_name], - :tag => ['neutron-package', 'openstack'], + :tag => ['openstack', 'neutron-package'], ) end end diff --git a/spec/unit/type/ironic_neutron_agent_config_spec.rb b/spec/unit/type/ironic_neutron_agent_config_spec.rb index ded894ec4..9ee994705 100644 --- a/spec/unit/type/ironic_neutron_agent_config_spec.rb +++ b/spec/unit/type/ironic_neutron_agent_config_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:ironic_neutron_agent_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'python2-ironic-neutron-agent') - catalog.add_resource package, @ironic_neutron_agent_config + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @ironic_neutron_agent_config dependency = @ironic_neutron_agent_config.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@ironic_neutron_agent_config) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_agent_linuxbridge_spec.rb b/spec/unit/type/neutron_agent_linuxbridge_spec.rb index 8f6d67656..15df3081d 100644 --- a/spec/unit/type/neutron_agent_linuxbridge_spec.rb +++ b/spec/unit/type/neutron_agent_linuxbridge_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_agent_linuxbridge)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron-plugin-linuxbridge-agent') - catalog.add_resource package, @neutron_agent_linuxbridge + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_agent_linuxbridge dependency = @neutron_agent_linuxbridge.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_agent_linuxbridge) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_agent_ovs_spec.rb b/spec/unit/type/neutron_agent_ovs_spec.rb index 425f58ff9..048f9dab9 100644 --- a/spec/unit/type/neutron_agent_ovs_spec.rb +++ b/spec/unit/type/neutron_agent_ovs_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_agent_ovs)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron-ovs-agent') - catalog.add_resource package, @neutron_agent_ovs + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_agent_ovs dependency = @neutron_agent_ovs.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_agent_ovs) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_agent_vpp_spec.rb b/spec/unit/type/neutron_agent_vpp_spec.rb index 6ff2da761..1ef543310 100644 --- a/spec/unit/type/neutron_agent_vpp_spec.rb +++ b/spec/unit/type/neutron_agent_vpp_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_agent_vpp)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron-vpp-agent') - catalog.add_resource package, @neutron_agent_vpp + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_agent_vpp dependency = @neutron_agent_vpp.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_agent_vpp) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_api_paste_ini_spec.rb b/spec/unit/type/neutron_api_paste_ini_spec.rb index f3d5d037b..a0b7e8a44 100644 --- a/spec/unit/type/neutron_api_paste_ini_spec.rb +++ b/spec/unit/type/neutron_api_paste_ini_spec.rb @@ -23,12 +23,12 @@ describe 'Puppet::Type.type(:neutron_api_paste_ini)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron') - catalog.add_resource package, @neutron_api_paste_ini + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_api_paste_ini dependency = @neutron_api_paste_ini.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_api_paste_ini) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_bgp_dragent_config_spec.rb b/spec/unit/type/neutron_bgp_dragent_config_spec.rb index 0268e820c..0f2d6dd96 100644 --- a/spec/unit/type/neutron_bgp_dragent_config_spec.rb +++ b/spec/unit/type/neutron_bgp_dragent_config_spec.rb @@ -9,15 +9,12 @@ describe 'Puppet::Type.type(:neutron_bgp_dragent_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package1 = Puppet::Type.type(:package).new(:name => 'neutron-dynamic-routing') - package2 = Puppet::Type.type(:package).new(:name => 'neutron-bgp-dragent') - catalog.add_resource package1, package2, @neutron_bgp_dragent_config + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_bgp_dragent_config dependency = @neutron_bgp_dragent_config.autorequire - expect(dependency.size).to eq(2) + expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_bgp_dragent_config) - expect(dependency[0].source).to eq(package1) - expect(dependency[1].target).to eq(@neutron_bgp_dragent_config) - expect(dependency[1].source).to eq(package2) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_bgpvpn_bagpipe_config_spec.rb b/spec/unit/type/neutron_bgpvpn_bagpipe_config_spec.rb index e91b4626f..732d45987 100644 --- a/spec/unit/type/neutron_bgpvpn_bagpipe_config_spec.rb +++ b/spec/unit/type/neutron_bgpvpn_bagpipe_config_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_bgpvpn_bagpipe_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'openstack-bagpipe-bgp') - catalog.add_resource package, @neutron_bgpvpn_bagpipe_config + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_bgpvpn_bagpipe_config dependency = @neutron_bgpvpn_bagpipe_config.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_bgpvpn_bagpipe_config) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_bgpvpn_service_config_spec.rb b/spec/unit/type/neutron_bgpvpn_service_config_spec.rb index 8659d9039..45d6eac0a 100644 --- a/spec/unit/type/neutron_bgpvpn_service_config_spec.rb +++ b/spec/unit/type/neutron_bgpvpn_service_config_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_bgpvpn_service_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'python-networking-bgpvpn') - catalog.add_resource package, @neutron_bgpvpn_service_config + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_bgpvpn_service_config dependency = @neutron_bgpvpn_service_config.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_bgpvpn_service_config) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_config_spec.rb b/spec/unit/type/neutron_config_spec.rb index 868f7a3f1..a3ecc54b8 100644 --- a/spec/unit/type/neutron_config_spec.rb +++ b/spec/unit/type/neutron_config_spec.rb @@ -54,12 +54,12 @@ describe 'Puppet::Type.type(:neutron_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron') - catalog.add_resource package, @neutron_config + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_config dependency = @neutron_config.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_config) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_dhcp_agent_config_spec.rb b/spec/unit/type/neutron_dhcp_agent_config_spec.rb index c0cc8bc99..d79e86159 100644 --- a/spec/unit/type/neutron_dhcp_agent_config_spec.rb +++ b/spec/unit/type/neutron_dhcp_agent_config_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_dhcp_agent_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron') - catalog.add_resource package, @neutron_dhcp_agent_config + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_dhcp_agent_config dependency = @neutron_dhcp_agent_config.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_dhcp_agent_config) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_fwaas_service_config_spec.rb b/spec/unit/type/neutron_fwaas_service_config_spec.rb index 0fe535dc0..72af81a9b 100644 --- a/spec/unit/type/neutron_fwaas_service_config_spec.rb +++ b/spec/unit/type/neutron_fwaas_service_config_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_fwaas_service_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron-fwaas') - catalog.add_resource package, @neutron_fwaas_service_config + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_fwaas_service_config dependency = @neutron_fwaas_service_config.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_fwaas_service_config) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_l2gw_agent_config_spec.rb b/spec/unit/type/neutron_l2gw_agent_config_spec.rb index 7f2521c0a..ba25de723 100644 --- a/spec/unit/type/neutron_l2gw_agent_config_spec.rb +++ b/spec/unit/type/neutron_l2gw_agent_config_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_l2gw_agent_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron-l2gw-agent') - catalog.add_resource package, @neutron_l2gw_agent_config + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_l2gw_agent_config dependency = @neutron_l2gw_agent_config.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_l2gw_agent_config) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_l2gw_service_config_spec.rb b/spec/unit/type/neutron_l2gw_service_config_spec.rb index 02480e1ce..19dab026a 100644 --- a/spec/unit/type/neutron_l2gw_service_config_spec.rb +++ b/spec/unit/type/neutron_l2gw_service_config_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:nova_plugin_l2gw)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'python-networking-l2gw') - catalog.add_resource package, @neutron_l2gw_service_config + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_l2gw_service_config dependency = @neutron_l2gw_service_config.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_l2gw_service_config) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_l3_agent_config_spec.rb b/spec/unit/type/neutron_l3_agent_config_spec.rb index eb4f1bfca..6c3f61921 100644 --- a/spec/unit/type/neutron_l3_agent_config_spec.rb +++ b/spec/unit/type/neutron_l3_agent_config_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_l3_agent_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron') - catalog.add_resource package, @neutron_fwaas_service_config + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_fwaas_service_config dependency = @neutron_fwaas_service_config.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_fwaas_service_config) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_metadata_agent_config_spec.rb b/spec/unit/type/neutron_metadata_agent_config_spec.rb index 83c1a01bd..faa98c2ba 100644 --- a/spec/unit/type/neutron_metadata_agent_config_spec.rb +++ b/spec/unit/type/neutron_metadata_agent_config_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_metadata_agent_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron') - catalog.add_resource package, @neutron_metadata_agent_config + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_metadata_agent_config dependency = @neutron_metadata_agent_config.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_metadata_agent_config) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_metering_agent_config_spec.rb b/spec/unit/type/neutron_metering_agent_config_spec.rb index 1534924ba..f6e0e29a7 100644 --- a/spec/unit/type/neutron_metering_agent_config_spec.rb +++ b/spec/unit/type/neutron_metering_agent_config_spec.rb @@ -9,15 +9,12 @@ describe 'Puppet::Type.type(:neutron_metering_agent_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package1 = Puppet::Type.type(:package).new(:name => 'neutron') - package2 = Puppet::Type.type(:package).new(:name => 'neutron-metering-agent') - catalog.add_resource package1, package2, @neutron_metering_agent_config + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_metering_agent_config dependency = @neutron_metering_agent_config.autorequire - expect(dependency.size).to eq(2) + expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_metering_agent_config) - expect(dependency[0].source).to eq(package1) - expect(dependency[1].target).to eq(@neutron_metering_agent_config) - expect(dependency[1].source).to eq(package2) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_plugin_cisco_credentials_spec.rb b/spec/unit/type/neutron_plugin_cisco_credentials_spec.rb index d14bcdc04..a046a6471 100644 --- a/spec/unit/type/neutron_plugin_cisco_credentials_spec.rb +++ b/spec/unit/type/neutron_plugin_cisco_credentials_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_plugin_cisco_credentials)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron-plugin-cisco') - catalog.add_resource package, @neutron_plugin_cisco_credentials + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_plugin_cisco_credentials dependency = @neutron_plugin_cisco_credentials.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_plugin_cisco_credentials) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_plugin_cisco_db_conn_spec.rb b/spec/unit/type/neutron_plugin_cisco_db_conn_spec.rb index b301f3f6f..bce7bd241 100644 --- a/spec/unit/type/neutron_plugin_cisco_db_conn_spec.rb +++ b/spec/unit/type/neutron_plugin_cisco_db_conn_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_plugin_cisco_db_conn)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron-plugin-cisco') - catalog.add_resource package, @neutron_plugin_cisco_db_conn + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_plugin_cisco_db_conn dependency = @neutron_plugin_cisco_db_conn.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_plugin_cisco_db_conn) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_plugin_cisco_l2network_spec.rb b/spec/unit/type/neutron_plugin_cisco_l2network_spec.rb index be865d4cd..63973d121 100644 --- a/spec/unit/type/neutron_plugin_cisco_l2network_spec.rb +++ b/spec/unit/type/neutron_plugin_cisco_l2network_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_plugin_cisco_l2network)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron-plugin-cisco') - catalog.add_resource package, @neutron_plugin_cisco_l2network + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_plugin_cisco_l2network dependency = @neutron_plugin_cisco_l2network.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_plugin_cisco_l2network) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_plugin_cisco_spec.rb b/spec/unit/type/neutron_plugin_cisco_spec.rb index eb36a3a05..dbf03374a 100644 --- a/spec/unit/type/neutron_plugin_cisco_spec.rb +++ b/spec/unit/type/neutron_plugin_cisco_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:nova_plugin_cisco)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron-plugin-cisco') - catalog.add_resource package, @neutron_plugin_cisco + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_plugin_cisco dependency = @neutron_plugin_cisco.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_plugin_cisco) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_plugin_midonet_spec.rb b/spec/unit/type/neutron_plugin_midonet_spec.rb index 17220359e..b61fcc40f 100644 --- a/spec/unit/type/neutron_plugin_midonet_spec.rb +++ b/spec/unit/type/neutron_plugin_midonet_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_plugin_midonet)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'python-networking-midonet') - catalog.add_resource package, @neutron_plugin_midonet + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_plugin_midonet dependency = @neutron_plugin_midonet.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_plugin_midonet) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_plugin_ml2_spec.rb b/spec/unit/type/neutron_plugin_ml2_spec.rb index 1bba9deac..cd7de0404 100644 --- a/spec/unit/type/neutron_plugin_ml2_spec.rb +++ b/spec/unit/type/neutron_plugin_ml2_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_plugin_ml2)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron-plugin-ml2') - catalog.add_resource package, @neutron_plugin_ml2 + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_plugin_ml2 dependency = @neutron_plugin_ml2.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_plugin_ml2) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_plugin_nsx_spec.rb b/spec/unit/type/neutron_plugin_nsx_spec.rb index 9c6fa8efd..125ee6e5a 100644 --- a/spec/unit/type/neutron_plugin_nsx_spec.rb +++ b/spec/unit/type/neutron_plugin_nsx_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_plugin_nsx)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'vmware-nsx') - catalog.add_resource package, @neutron_plugin_nsx + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_plugin_nsx dependency = @neutron_plugin_nsx.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_plugin_nsx) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_plugin_nvp_spec.rb b/spec/unit/type/neutron_plugin_nvp_spec.rb index 19ab33423..7300b1845 100644 --- a/spec/unit/type/neutron_plugin_nvp_spec.rb +++ b/spec/unit/type/neutron_plugin_nvp_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_plugin_nvp)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron-plugin-nvp') - catalog.add_resource package, @neutron_plugin_nvp + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_plugin_nvp dependency = @neutron_plugin_nvp.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_plugin_nvp) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_plugin_opencontrail_spec.rb b/spec/unit/type/neutron_plugin_opencontrail_spec.rb index fd8f4a175..a839b6584 100644 --- a/spec/unit/type/neutron_plugin_opencontrail_spec.rb +++ b/spec/unit/type/neutron_plugin_opencontrail_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_plugin_opencontrail)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron-plugin-opencontrail') - catalog.add_resource package, @neutron_plugin_opencontrail + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_plugin_opencontrail dependency = @neutron_plugin_opencontrail.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_plugin_opencontrail) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_plugin_plumgrid_spec.rb b/spec/unit/type/neutron_plugin_plumgrid_spec.rb index fbe62b795..718b2b986 100644 --- a/spec/unit/type/neutron_plugin_plumgrid_spec.rb +++ b/spec/unit/type/neutron_plugin_plumgrid_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_plugin_plumgrid)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron-plugin-plumgrid') - catalog.add_resource package, @neutron_plugin_plumgrid + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_plugin_plumgrid dependency = @neutron_plugin_plumgrid.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_plugin_plumgrid) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_plumlib_plumgrid_spec.rb b/spec/unit/type/neutron_plumlib_plumgrid_spec.rb index b38663183..2d5addc6b 100644 --- a/spec/unit/type/neutron_plumlib_plumgrid_spec.rb +++ b/spec/unit/type/neutron_plumlib_plumgrid_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_plumlib_plumgrid)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron-plumlib-plumgrid') - catalog.add_resource package, @neutron_plumlib_plumgrid + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_plumlib_plumgrid dependency = @neutron_plumlib_plumgrid.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_plumlib_plumgrid) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_rootwrap_config_spec.rb b/spec/unit/type/neutron_rootwrap_config_spec.rb index c656fb841..a4ea8febf 100644 --- a/spec/unit/type/neutron_rootwrap_config_spec.rb +++ b/spec/unit/type/neutron_rootwrap_config_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_rootwrap_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'neutron-common') - catalog.add_resource package, @neutron_rootwrap_config + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_rootwrap_config dependency = @neutron_rootwrap_config.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_rootwrap_config) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_sfc_service_config_spec.rb b/spec/unit/type/neutron_sfc_service_config_spec.rb index d0a089900..af5e20ae5 100644 --- a/spec/unit/type/neutron_sfc_service_config_spec.rb +++ b/spec/unit/type/neutron_sfc_service_config_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:neutron_sfc_service_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'python-networking-sfc') - catalog.add_resource package, @neutron_sfc_service_config + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_sfc_service_config dependency = @neutron_sfc_service_config.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_sfc_service_config) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/neutron_vpnaas_agent_config_spec.rb b/spec/unit/type/neutron_vpnaas_agent_config_spec.rb index 33ed628a0..1f0e3a74e 100644 --- a/spec/unit/type/neutron_vpnaas_agent_config_spec.rb +++ b/spec/unit/type/neutron_vpnaas_agent_config_spec.rb @@ -9,15 +9,12 @@ describe 'Puppet::Type.type(:neutron_vpnaas_agent_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package1 = Puppet::Type.type(:package).new(:name => 'neutron') - package2 = Puppet::Type.type(:package).new(:name => 'neutron-vpnaas-agent') - catalog.add_resource package1, package2, @neutron_vpnaas_agent_config + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @neutron_vpnaas_agent_config dependency = @neutron_vpnaas_agent_config.autorequire - expect(dependency.size).to eq(2) + expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@neutron_vpnaas_agent_config) - expect(dependency[0].source).to eq(package1) - expect(dependency[1].target).to eq(@neutron_vpnaas_agent_config) - expect(dependency[1].source).to eq(package2) + expect(dependency[0].source).to eq(anchor) end end diff --git a/spec/unit/type/ovn_metadata_agent_config_spec.rb b/spec/unit/type/ovn_metadata_agent_config_spec.rb index e5ea76f30..5f4a97547 100644 --- a/spec/unit/type/ovn_metadata_agent_config_spec.rb +++ b/spec/unit/type/ovn_metadata_agent_config_spec.rb @@ -9,12 +9,12 @@ describe 'Puppet::Type.type(:ovn_metadata_agent_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'python-networking-ovn-metadata-agent') - catalog.add_resource package, @ovn_metadata_agent_config + anchor = Puppet::Type.type(:anchor).new(:name => 'neutron::install::end') + catalog.add_resource anchor, @ovn_metadata_agent_config dependency = @ovn_metadata_agent_config.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@ovn_metadata_agent_config) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end end