From 6353c0bb1d9d984130ac6cffe9ec332f53755268 Mon Sep 17 00:00:00 2001 From: Dmitry Nikishov Date: Tue, 15 Nov 2016 17:41:52 +0300 Subject: [PATCH] Added override_resources for non-OpenStack tasks Change-Id: If469ff6d76cbbc6f9feee3f167e8d4d4066e2e07 Blueprint: puppet-resource-override DocImpact --- deployment/puppet/osnailyfacter/modular/apache/apache.pp | 1 + deployment/puppet/osnailyfacter/modular/api-proxy/api-proxy.pp | 1 + .../osnailyfacter/modular/astute/dump_rabbitmq_definitions.pp | 1 + .../puppet/osnailyfacter/modular/astute/purge_service_entries.pp | 1 + .../puppet/osnailyfacter/modular/astute/service_token_off.pp | 1 + deployment/puppet/osnailyfacter/modular/astute/upload_cirros.pp | 1 + deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp | 1 + deployment/puppet/osnailyfacter/modular/ceph/ceph_compute.pp | 1 + deployment/puppet/osnailyfacter/modular/ceph/ceph_pools.pp | 1 + deployment/puppet/osnailyfacter/modular/ceph/ceph_ready_check.pp | 1 + deployment/puppet/osnailyfacter/modular/ceph/mon.pp | 1 + .../puppet/osnailyfacter/modular/ceph/primary_mon_update.pp | 1 + deployment/puppet/osnailyfacter/modular/ceph/radosgw.pp | 1 + deployment/puppet/osnailyfacter/modular/ceph/radosgw_keystone.pp | 1 + deployment/puppet/osnailyfacter/modular/ceph/updatedb.pp | 1 + deployment/puppet/osnailyfacter/modular/cgroups/cgroups.pp | 1 + .../osnailyfacter/modular/cluster-vrouter/cluster-vrouter.pp | 1 + deployment/puppet/osnailyfacter/modular/cluster/cluster.pp | 1 + deployment/puppet/osnailyfacter/modular/cluster/health.pp | 1 + deployment/puppet/osnailyfacter/modular/dns/dns-client.pp | 1 + deployment/puppet/osnailyfacter/modular/dns/dns-server.pp | 1 + deployment/puppet/osnailyfacter/modular/firewall/firewall.pp | 1 + deployment/puppet/osnailyfacter/modular/fuel_pkgs/fuel_pkgs.pp | 1 + .../puppet/osnailyfacter/modular/fuel_pkgs/setup_repositories.pp | 1 + .../puppet/osnailyfacter/modular/generate_vms/generate_vms.pp | 1 + deployment/puppet/osnailyfacter/modular/globals/globals.pp | 1 + deployment/puppet/osnailyfacter/modular/hiera/hiera.pp | 1 + .../puppet/osnailyfacter/modular/hiera/override_configuration.pp | 1 + deployment/puppet/osnailyfacter/modular/hosts/hosts.pp | 1 + .../puppet/osnailyfacter/modular/keystone/purge_old_admin.pp | 1 + deployment/puppet/osnailyfacter/modular/logging/logging.pp | 1 + deployment/puppet/osnailyfacter/modular/memcached/memcached.pp | 1 + .../osnailyfacter/modular/netconfig/configure_default_route.pp | 1 + .../puppet/osnailyfacter/modular/netconfig/connectivity_tests.pp | 1 + .../osnailyfacter/modular/netconfig/hiera_default_route.pp | 1 + deployment/puppet/osnailyfacter/modular/netconfig/netconfig.pp | 1 + .../puppet/osnailyfacter/modular/netconfig/remove_ovs_usage.pp | 1 + .../puppet/osnailyfacter/modular/netconfig/reserved_ports.pp | 1 + deployment/puppet/osnailyfacter/modular/ntp/ntp-check.pp | 1 + deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp | 1 + deployment/puppet/osnailyfacter/modular/ntp/ntp-server.pp | 1 + .../modular/openstack-haproxy/openstack-haproxy-aodh.pp | 1 + .../modular/openstack-haproxy/openstack-haproxy-ceilometer.pp | 1 + .../modular/openstack-haproxy/openstack-haproxy-cinder.pp | 1 + .../modular/openstack-haproxy/openstack-haproxy-glance.pp | 1 + .../modular/openstack-haproxy/openstack-haproxy-heat.pp | 1 + .../modular/openstack-haproxy/openstack-haproxy-horizon.pp | 1 + .../modular/openstack-haproxy/openstack-haproxy-ironic.pp | 1 + .../modular/openstack-haproxy/openstack-haproxy-keystone.pp | 1 + .../modular/openstack-haproxy/openstack-haproxy-murano.pp | 1 + .../modular/openstack-haproxy/openstack-haproxy-mysqld.pp | 1 + .../modular/openstack-haproxy/openstack-haproxy-neutron.pp | 1 + .../modular/openstack-haproxy/openstack-haproxy-nova.pp | 1 + .../modular/openstack-haproxy/openstack-haproxy-radosgw.pp | 1 + .../modular/openstack-haproxy/openstack-haproxy-sahara.pp | 1 + .../modular/openstack-haproxy/openstack-haproxy-stats.pp | 1 + .../modular/openstack-haproxy/openstack-haproxy-swift.pp | 1 + .../osnailyfacter/modular/openstack-haproxy/openstack-haproxy.pp | 1 + deployment/puppet/osnailyfacter/modular/plugins/plugins_rsync.pp | 1 + .../osnailyfacter/modular/plugins/plugins_setup_repositories.pp | 1 + .../puppet/osnailyfacter/modular/ssl/ssl_add_trust_chain.pp | 1 + deployment/puppet/osnailyfacter/modular/ssl/ssl_dns_setup.pp | 1 + deployment/puppet/osnailyfacter/modular/ssl/ssl_keys_saving.pp | 1 + deployment/puppet/osnailyfacter/modular/tools/tools.pp | 1 + deployment/puppet/osnailyfacter/modular/umm/umm.pp | 1 + .../puppet/osnailyfacter/modular/virtual_ips/conntrackd.pp | 1 + .../puppet/osnailyfacter/modular/virtual_ips/public_vip_ping.pp | 1 + .../puppet/osnailyfacter/modular/virtual_ips/virtual_ips.pp | 1 + deployment/puppet/osnailyfacter/modular/vmware/cinder-vmware.pp | 1 + deployment/puppet/osnailyfacter/modular/vmware/compute-vmware.pp | 1 + deployment/puppet/osnailyfacter/modular/vmware/vcenter.pp | 1 + 71 files changed, 71 insertions(+) diff --git a/deployment/puppet/osnailyfacter/modular/apache/apache.pp b/deployment/puppet/osnailyfacter/modular/apache/apache.pp index 356ec08dcb..8ad807bb00 100644 --- a/deployment/puppet/osnailyfacter/modular/apache/apache.pp +++ b/deployment/puppet/osnailyfacter/modular/apache/apache.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::apache::apache' :} class { '::osnailyfacter::upgrade::restart_services' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/api-proxy/api-proxy.pp b/deployment/puppet/osnailyfacter/modular/api-proxy/api-proxy.pp index 2831a81609..5077d932ca 100644 --- a/deployment/puppet/osnailyfacter/modular/api-proxy/api-proxy.pp +++ b/deployment/puppet/osnailyfacter/modular/api-proxy/api-proxy.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::api_proxy::api_proxy' :} class { '::osnailyfacter::upgrade::restart_services' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/astute/dump_rabbitmq_definitions.pp b/deployment/puppet/osnailyfacter/modular/astute/dump_rabbitmq_definitions.pp index 1e51eb6f3f..24472aafef 100644 --- a/deployment/puppet/osnailyfacter/modular/astute/dump_rabbitmq_definitions.pp +++ b/deployment/puppet/osnailyfacter/modular/astute/dump_rabbitmq_definitions.pp @@ -1 +1,2 @@ class { '::osnailyfacter::astute::dump_rabbitmq_definitions' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/astute/purge_service_entries.pp b/deployment/puppet/osnailyfacter/modular/astute/purge_service_entries.pp index 5ef2d5f8d8..211a49ea3a 100644 --- a/deployment/puppet/osnailyfacter/modular/astute/purge_service_entries.pp +++ b/deployment/puppet/osnailyfacter/modular/astute/purge_service_entries.pp @@ -1 +1,2 @@ include ::osnailyfacter::astute::purge_service_entries +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/astute/service_token_off.pp b/deployment/puppet/osnailyfacter/modular/astute/service_token_off.pp index 3b52611669..cd1e3f40d6 100644 --- a/deployment/puppet/osnailyfacter/modular/astute/service_token_off.pp +++ b/deployment/puppet/osnailyfacter/modular/astute/service_token_off.pp @@ -1 +1,2 @@ class { '::osnailyfacter::astute::service_token_off' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/astute/upload_cirros.pp b/deployment/puppet/osnailyfacter/modular/astute/upload_cirros.pp index 1f0606277d..d7b0920e9e 100644 --- a/deployment/puppet/osnailyfacter/modular/astute/upload_cirros.pp +++ b/deployment/puppet/osnailyfacter/modular/astute/upload_cirros.pp @@ -1 +1,2 @@ class { '::osnailyfacter::astute::upload_cirros': } +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp b/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp index ba8addf6a3..96e5a179e9 100644 --- a/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp +++ b/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::ceph::ceph_osd' :} class { '::osnailyfacter::upgrade::ceph_service' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/ceph/ceph_compute.pp b/deployment/puppet/osnailyfacter/modular/ceph/ceph_compute.pp index 9f18b79c6c..6b53615649 100644 --- a/deployment/puppet/osnailyfacter/modular/ceph/ceph_compute.pp +++ b/deployment/puppet/osnailyfacter/modular/ceph/ceph_compute.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::ceph::ceph_compute' :} class { '::osnailyfacter::upgrade::ceph_service' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/ceph/ceph_pools.pp b/deployment/puppet/osnailyfacter/modular/ceph/ceph_pools.pp index a5a396adb6..c074963478 100644 --- a/deployment/puppet/osnailyfacter/modular/ceph/ceph_pools.pp +++ b/deployment/puppet/osnailyfacter/modular/ceph/ceph_pools.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::ceph::ceph_pools' :} class { '::osnailyfacter::upgrade::ceph_service' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/ceph/ceph_ready_check.pp b/deployment/puppet/osnailyfacter/modular/ceph/ceph_ready_check.pp index 564232bdf0..8fdce41ed1 100644 --- a/deployment/puppet/osnailyfacter/modular/ceph/ceph_ready_check.pp +++ b/deployment/puppet/osnailyfacter/modular/ceph/ceph_ready_check.pp @@ -10,3 +10,4 @@ exec { 'ceph_ready_check' : logoutput => true, } +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/ceph/mon.pp b/deployment/puppet/osnailyfacter/modular/ceph/mon.pp index e28531251b..46b5e8f9f4 100644 --- a/deployment/puppet/osnailyfacter/modular/ceph/mon.pp +++ b/deployment/puppet/osnailyfacter/modular/ceph/mon.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::ceph::mon' :} class { '::osnailyfacter::upgrade::ceph_service' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/ceph/primary_mon_update.pp b/deployment/puppet/osnailyfacter/modular/ceph/primary_mon_update.pp index 9dab449ad9..d8c6db3cd1 100644 --- a/deployment/puppet/osnailyfacter/modular/ceph/primary_mon_update.pp +++ b/deployment/puppet/osnailyfacter/modular/ceph/primary_mon_update.pp @@ -1 +1,2 @@ include ::osnailyfacter::ceph::primary_mon_update +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/ceph/radosgw.pp b/deployment/puppet/osnailyfacter/modular/ceph/radosgw.pp index cd35eac875..a2892120f0 100644 --- a/deployment/puppet/osnailyfacter/modular/ceph/radosgw.pp +++ b/deployment/puppet/osnailyfacter/modular/ceph/radosgw.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::ceph::radosgw' :} class { '::osnailyfacter::upgrade::ceph_service' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/ceph/radosgw_keystone.pp b/deployment/puppet/osnailyfacter/modular/ceph/radosgw_keystone.pp index 214ef187b8..f6a95b466b 100644 --- a/deployment/puppet/osnailyfacter/modular/ceph/radosgw_keystone.pp +++ b/deployment/puppet/osnailyfacter/modular/ceph/radosgw_keystone.pp @@ -1 +1,2 @@ class { '::osnailyfacter::ceph::radosgw_keystone' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/ceph/updatedb.pp b/deployment/puppet/osnailyfacter/modular/ceph/updatedb.pp index a2fcd4d03d..c021ff4190 100644 --- a/deployment/puppet/osnailyfacter/modular/ceph/updatedb.pp +++ b/deployment/puppet/osnailyfacter/modular/ceph/updatedb.pp @@ -1 +1,2 @@ class { '::osnailyfacter::ceph::updatedb' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/cgroups/cgroups.pp b/deployment/puppet/osnailyfacter/modular/cgroups/cgroups.pp index a031d798a4..f3dca6cac3 100644 --- a/deployment/puppet/osnailyfacter/modular/cgroups/cgroups.pp +++ b/deployment/puppet/osnailyfacter/modular/cgroups/cgroups.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::cgroups::cgroups' :} class { '::osnailyfacter::upgrade::restart_services' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/cluster-vrouter/cluster-vrouter.pp b/deployment/puppet/osnailyfacter/modular/cluster-vrouter/cluster-vrouter.pp index 058c277621..c6ce67818b 100644 --- a/deployment/puppet/osnailyfacter/modular/cluster-vrouter/cluster-vrouter.pp +++ b/deployment/puppet/osnailyfacter/modular/cluster-vrouter/cluster-vrouter.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::cluster_vrouter::cluster_vrouter' :} class { '::osnailyfacter::upgrade::restart_services' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/cluster/cluster.pp b/deployment/puppet/osnailyfacter/modular/cluster/cluster.pp index 2f5b438907..e921636269 100644 --- a/deployment/puppet/osnailyfacter/modular/cluster/cluster.pp +++ b/deployment/puppet/osnailyfacter/modular/cluster/cluster.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::cluster::cluster' :} class { '::osnailyfacter::upgrade::restart_services' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/cluster/health.pp b/deployment/puppet/osnailyfacter/modular/cluster/health.pp index 7a8fda05ef..ca1f3696a4 100644 --- a/deployment/puppet/osnailyfacter/modular/cluster/health.pp +++ b/deployment/puppet/osnailyfacter/modular/cluster/health.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::cluster::health' :} class { '::osnailyfacter::upgrade::restart_services' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/dns/dns-client.pp b/deployment/puppet/osnailyfacter/modular/dns/dns-client.pp index 42a1fb7d29..1fd6ce1116 100644 --- a/deployment/puppet/osnailyfacter/modular/dns/dns-client.pp +++ b/deployment/puppet/osnailyfacter/modular/dns/dns-client.pp @@ -1 +1,2 @@ class { '::osnailyfacter::dns::dns_client' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/dns/dns-server.pp b/deployment/puppet/osnailyfacter/modular/dns/dns-server.pp index 4f5f8b9d31..b367c3ef6a 100644 --- a/deployment/puppet/osnailyfacter/modular/dns/dns-server.pp +++ b/deployment/puppet/osnailyfacter/modular/dns/dns-server.pp @@ -1 +1,2 @@ class { '::osnailyfacter::dns::dns_server' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/firewall/firewall.pp b/deployment/puppet/osnailyfacter/modular/firewall/firewall.pp index 104d58a466..13bf85869f 100644 --- a/deployment/puppet/osnailyfacter/modular/firewall/firewall.pp +++ b/deployment/puppet/osnailyfacter/modular/firewall/firewall.pp @@ -1 +1,2 @@ class { '::osnailyfacter::firewall::firewall' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/fuel_pkgs/fuel_pkgs.pp b/deployment/puppet/osnailyfacter/modular/fuel_pkgs/fuel_pkgs.pp index e2de7acf89..562cd10765 100644 --- a/deployment/puppet/osnailyfacter/modular/fuel_pkgs/fuel_pkgs.pp +++ b/deployment/puppet/osnailyfacter/modular/fuel_pkgs/fuel_pkgs.pp @@ -1 +1,2 @@ class { '::osnailyfacter::fuel_pkgs::fuel_pkgs' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/fuel_pkgs/setup_repositories.pp b/deployment/puppet/osnailyfacter/modular/fuel_pkgs/setup_repositories.pp index 898b82975c..7dd5576542 100644 --- a/deployment/puppet/osnailyfacter/modular/fuel_pkgs/setup_repositories.pp +++ b/deployment/puppet/osnailyfacter/modular/fuel_pkgs/setup_repositories.pp @@ -1 +1,2 @@ class { '::osnailyfacter::fuel_pkgs::setup_repositories' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/generate_vms/generate_vms.pp b/deployment/puppet/osnailyfacter/modular/generate_vms/generate_vms.pp index 10a6fb8cb3..76c2564103 100644 --- a/deployment/puppet/osnailyfacter/modular/generate_vms/generate_vms.pp +++ b/deployment/puppet/osnailyfacter/modular/generate_vms/generate_vms.pp @@ -1 +1,2 @@ class { '::osnailyfacter::generate_vms::generate_vms' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/globals/globals.pp b/deployment/puppet/osnailyfacter/modular/globals/globals.pp index 70478a14a3..b7889caf46 100644 --- a/deployment/puppet/osnailyfacter/modular/globals/globals.pp +++ b/deployment/puppet/osnailyfacter/modular/globals/globals.pp @@ -1 +1,2 @@ class { '::osnailyfacter::globals::globals' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/hiera/hiera.pp b/deployment/puppet/osnailyfacter/modular/hiera/hiera.pp index 5e3a2d097a..e358453b18 100644 --- a/deployment/puppet/osnailyfacter/modular/hiera/hiera.pp +++ b/deployment/puppet/osnailyfacter/modular/hiera/hiera.pp @@ -1 +1,2 @@ class { '::osnailyfacter::hiera::hiera' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/hiera/override_configuration.pp b/deployment/puppet/osnailyfacter/modular/hiera/override_configuration.pp index 5d3824d941..1759cc1273 100644 --- a/deployment/puppet/osnailyfacter/modular/hiera/override_configuration.pp +++ b/deployment/puppet/osnailyfacter/modular/hiera/override_configuration.pp @@ -1 +1,2 @@ class { '::osnailyfacter::hiera::override_configuration' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/hosts/hosts.pp b/deployment/puppet/osnailyfacter/modular/hosts/hosts.pp index 0466ab7027..ce0d34bd20 100644 --- a/deployment/puppet/osnailyfacter/modular/hosts/hosts.pp +++ b/deployment/puppet/osnailyfacter/modular/hosts/hosts.pp @@ -1 +1,2 @@ class { '::osnailyfacter::hosts::hosts' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/keystone/purge_old_admin.pp b/deployment/puppet/osnailyfacter/modular/keystone/purge_old_admin.pp index c43e866589..1ffcdf9cd7 100644 --- a/deployment/puppet/osnailyfacter/modular/keystone/purge_old_admin.pp +++ b/deployment/puppet/osnailyfacter/modular/keystone/purge_old_admin.pp @@ -1 +1,2 @@ class { '::openstack_tasks::keystone::purge_old_admin' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/logging/logging.pp b/deployment/puppet/osnailyfacter/modular/logging/logging.pp index 7cfd18a9f9..387802877c 100644 --- a/deployment/puppet/osnailyfacter/modular/logging/logging.pp +++ b/deployment/puppet/osnailyfacter/modular/logging/logging.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::logging::logging' :} class { '::osnailyfacter::upgrade::restart_services' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/memcached/memcached.pp b/deployment/puppet/osnailyfacter/modular/memcached/memcached.pp index 2654c9e471..47b51a7a3c 100644 --- a/deployment/puppet/osnailyfacter/modular/memcached/memcached.pp +++ b/deployment/puppet/osnailyfacter/modular/memcached/memcached.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::memcached::memcached' :} class { '::osnailyfacter::upgrade::restart_services' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/netconfig/configure_default_route.pp b/deployment/puppet/osnailyfacter/modular/netconfig/configure_default_route.pp index ccdeb8045d..777c81ec91 100644 --- a/deployment/puppet/osnailyfacter/modular/netconfig/configure_default_route.pp +++ b/deployment/puppet/osnailyfacter/modular/netconfig/configure_default_route.pp @@ -1 +1,2 @@ class { '::osnailyfacter::netconfig::configure_default_route' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/netconfig/connectivity_tests.pp b/deployment/puppet/osnailyfacter/modular/netconfig/connectivity_tests.pp index f4cf679f0f..417f07d52f 100644 --- a/deployment/puppet/osnailyfacter/modular/netconfig/connectivity_tests.pp +++ b/deployment/puppet/osnailyfacter/modular/netconfig/connectivity_tests.pp @@ -1 +1,2 @@ class { '::osnailyfacter::netconfig::connectivity_tests' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/netconfig/hiera_default_route.pp b/deployment/puppet/osnailyfacter/modular/netconfig/hiera_default_route.pp index c6fefc97af..32c658178f 100644 --- a/deployment/puppet/osnailyfacter/modular/netconfig/hiera_default_route.pp +++ b/deployment/puppet/osnailyfacter/modular/netconfig/hiera_default_route.pp @@ -1 +1,2 @@ class { '::osnailyfacter::netconfig::hiera_default_route' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/netconfig/netconfig.pp b/deployment/puppet/osnailyfacter/modular/netconfig/netconfig.pp index 4c456b1abc..e987a903ce 100644 --- a/deployment/puppet/osnailyfacter/modular/netconfig/netconfig.pp +++ b/deployment/puppet/osnailyfacter/modular/netconfig/netconfig.pp @@ -1 +1,2 @@ class { '::osnailyfacter::netconfig::netconfig' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/netconfig/remove_ovs_usage.pp b/deployment/puppet/osnailyfacter/modular/netconfig/remove_ovs_usage.pp index a0246c4cbb..29ca646eef 100644 --- a/deployment/puppet/osnailyfacter/modular/netconfig/remove_ovs_usage.pp +++ b/deployment/puppet/osnailyfacter/modular/netconfig/remove_ovs_usage.pp @@ -1 +1,2 @@ class { '::osnailyfacter::netconfig::remove_ovs_usage' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/netconfig/reserved_ports.pp b/deployment/puppet/osnailyfacter/modular/netconfig/reserved_ports.pp index 3ec55f7d72..eed03dacf7 100644 --- a/deployment/puppet/osnailyfacter/modular/netconfig/reserved_ports.pp +++ b/deployment/puppet/osnailyfacter/modular/netconfig/reserved_ports.pp @@ -1 +1,2 @@ class { '::osnailyfacter::netconfig::reserved_ports' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/ntp/ntp-check.pp b/deployment/puppet/osnailyfacter/modular/ntp/ntp-check.pp index d17c1f8f2e..7be875d8ba 100644 --- a/deployment/puppet/osnailyfacter/modular/ntp/ntp-check.pp +++ b/deployment/puppet/osnailyfacter/modular/ntp/ntp-check.pp @@ -1 +1,2 @@ class { '::osnailyfacter::ntp::ntp_check' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp b/deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp index 015d9ff466..bd696fb1d9 100644 --- a/deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp +++ b/deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::ntp::ntp_client' :} class { '::osnailyfacter::upgrade::restart_services' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/ntp/ntp-server.pp b/deployment/puppet/osnailyfacter/modular/ntp/ntp-server.pp index 368207a51d..fee23386cc 100644 --- a/deployment/puppet/osnailyfacter/modular/ntp/ntp-server.pp +++ b/deployment/puppet/osnailyfacter/modular/ntp/ntp-server.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::ntp::ntp_server' :} class { '::osnailyfacter::upgrade::restart_services' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-aodh.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-aodh.pp index 5cf2297f3d..a5b4fc2b1e 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-aodh.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-aodh.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy_aodh' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-ceilometer.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-ceilometer.pp index da2c541879..e3c6a29fb4 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-ceilometer.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-ceilometer.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy_ceilometer' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-cinder.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-cinder.pp index b92c07279d..3da479435a 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-cinder.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-cinder.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy_cinder' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-glance.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-glance.pp index 3a7dd46859..0026aeddc5 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-glance.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-glance.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy_glance' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-heat.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-heat.pp index d52eec5a9c..b537e9c933 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-heat.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-heat.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy_heat' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-horizon.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-horizon.pp index b3b10a4e82..e852c1f288 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-horizon.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-horizon.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy_horizon' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-ironic.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-ironic.pp index 83256b8798..9db7c05929 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-ironic.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-ironic.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy_ironic' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-keystone.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-keystone.pp index d72ee1985e..a70feeaf7c 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-keystone.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-keystone.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy_keystone' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-murano.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-murano.pp index e114acd17a..9437dd6088 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-murano.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-murano.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy_murano' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-mysqld.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-mysqld.pp index 55c0ee2114..e90fa6e91b 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-mysqld.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-mysqld.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy_mysqld' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-neutron.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-neutron.pp index 9178ce23ce..b4599a3f04 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-neutron.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-neutron.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy_neutron' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-nova.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-nova.pp index ec637df3c5..c0a48d8df9 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-nova.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-nova.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy_nova' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-radosgw.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-radosgw.pp index b9d68e03cf..40e6bfc2c3 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-radosgw.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-radosgw.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy_radosgw' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-sahara.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-sahara.pp index f7bca63cc2..3a5f529356 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-sahara.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-sahara.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy_sahara' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-stats.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-stats.pp index 92ae291cda..e89701f884 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-stats.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-stats.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy_stats' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-swift.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-swift.pp index 0984c906c1..7f0da79751 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-swift.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-swift.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy_swift' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy.pp b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy.pp index 2c26c180e6..582bcf7b68 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy.pp @@ -1 +1,2 @@ class { '::osnailyfacter::openstack_haproxy::openstack_haproxy' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/plugins/plugins_rsync.pp b/deployment/puppet/osnailyfacter/modular/plugins/plugins_rsync.pp index 13f545ca68..459d822323 100644 --- a/deployment/puppet/osnailyfacter/modular/plugins/plugins_rsync.pp +++ b/deployment/puppet/osnailyfacter/modular/plugins/plugins_rsync.pp @@ -1 +1,2 @@ include ::osnailyfacter::plugins::plugins_rsync +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/plugins/plugins_setup_repositories.pp b/deployment/puppet/osnailyfacter/modular/plugins/plugins_setup_repositories.pp index 79a00c715c..274f303f0c 100644 --- a/deployment/puppet/osnailyfacter/modular/plugins/plugins_setup_repositories.pp +++ b/deployment/puppet/osnailyfacter/modular/plugins/plugins_setup_repositories.pp @@ -1 +1,2 @@ include ::osnailyfacter::plugins::plugins_setup_repositories +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/ssl/ssl_add_trust_chain.pp b/deployment/puppet/osnailyfacter/modular/ssl/ssl_add_trust_chain.pp index 6c8badd1ac..f11b2808ce 100644 --- a/deployment/puppet/osnailyfacter/modular/ssl/ssl_add_trust_chain.pp +++ b/deployment/puppet/osnailyfacter/modular/ssl/ssl_add_trust_chain.pp @@ -1 +1,2 @@ class { '::osnailyfacter::ssl::ssl_add_trust_chain' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/ssl/ssl_dns_setup.pp b/deployment/puppet/osnailyfacter/modular/ssl/ssl_dns_setup.pp index fc59d2c1d0..70fa6d98e9 100644 --- a/deployment/puppet/osnailyfacter/modular/ssl/ssl_dns_setup.pp +++ b/deployment/puppet/osnailyfacter/modular/ssl/ssl_dns_setup.pp @@ -1 +1,2 @@ class { '::osnailyfacter::ssl::ssl_dns_setup' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/ssl/ssl_keys_saving.pp b/deployment/puppet/osnailyfacter/modular/ssl/ssl_keys_saving.pp index e289068f33..24f3c40673 100644 --- a/deployment/puppet/osnailyfacter/modular/ssl/ssl_keys_saving.pp +++ b/deployment/puppet/osnailyfacter/modular/ssl/ssl_keys_saving.pp @@ -1 +1,2 @@ class { '::osnailyfacter::ssl::ssl_keys_saving' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/tools/tools.pp b/deployment/puppet/osnailyfacter/modular/tools/tools.pp index 71d32c64b2..7bbfed9fd5 100644 --- a/deployment/puppet/osnailyfacter/modular/tools/tools.pp +++ b/deployment/puppet/osnailyfacter/modular/tools/tools.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::tools::tools' :} class { '::osnailyfacter::upgrade::restart_services' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/umm/umm.pp b/deployment/puppet/osnailyfacter/modular/umm/umm.pp index 53898dc707..851c080ad7 100644 --- a/deployment/puppet/osnailyfacter/modular/umm/umm.pp +++ b/deployment/puppet/osnailyfacter/modular/umm/umm.pp @@ -1 +1,2 @@ class { '::osnailyfacter::umm::umm' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/virtual_ips/conntrackd.pp b/deployment/puppet/osnailyfacter/modular/virtual_ips/conntrackd.pp index 83cb765d04..b8902baf43 100644 --- a/deployment/puppet/osnailyfacter/modular/virtual_ips/conntrackd.pp +++ b/deployment/puppet/osnailyfacter/modular/virtual_ips/conntrackd.pp @@ -1 +1,2 @@ class { '::osnailyfacter::virtual_ips::conntrackd' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/virtual_ips/public_vip_ping.pp b/deployment/puppet/osnailyfacter/modular/virtual_ips/public_vip_ping.pp index eff415818d..73fe5c1f01 100644 --- a/deployment/puppet/osnailyfacter/modular/virtual_ips/public_vip_ping.pp +++ b/deployment/puppet/osnailyfacter/modular/virtual_ips/public_vip_ping.pp @@ -1 +1,2 @@ class { '::osnailyfacter::virtual_ips::public_vip_ping' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/virtual_ips/virtual_ips.pp b/deployment/puppet/osnailyfacter/modular/virtual_ips/virtual_ips.pp index 91ee6210e2..89965fd668 100644 --- a/deployment/puppet/osnailyfacter/modular/virtual_ips/virtual_ips.pp +++ b/deployment/puppet/osnailyfacter/modular/virtual_ips/virtual_ips.pp @@ -1 +1,2 @@ class { '::osnailyfacter::virtual_ips::virtual_ips' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/vmware/cinder-vmware.pp b/deployment/puppet/osnailyfacter/modular/vmware/cinder-vmware.pp index dd3fa1cb5b..75a511c0c1 100644 --- a/deployment/puppet/osnailyfacter/modular/vmware/cinder-vmware.pp +++ b/deployment/puppet/osnailyfacter/modular/vmware/cinder-vmware.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::vmware::cinder_vmware' :} class { '::osnailyfacter::upgrade::restart_services' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/vmware/compute-vmware.pp b/deployment/puppet/osnailyfacter/modular/vmware/compute-vmware.pp index a68558bf19..0d75544141 100644 --- a/deployment/puppet/osnailyfacter/modular/vmware/compute-vmware.pp +++ b/deployment/puppet/osnailyfacter/modular/vmware/compute-vmware.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::vmware::compute_vmware' :} class { '::osnailyfacter::upgrade::restart_services' :} +class { '::osnailyfacter::override_resources': } diff --git a/deployment/puppet/osnailyfacter/modular/vmware/vcenter.pp b/deployment/puppet/osnailyfacter/modular/vmware/vcenter.pp index 923aedf6dc..f11d3eb6e0 100644 --- a/deployment/puppet/osnailyfacter/modular/vmware/vcenter.pp +++ b/deployment/puppet/osnailyfacter/modular/vmware/vcenter.pp @@ -1,2 +1,3 @@ class { '::osnailyfacter::vmware::vcenter' :} class { '::osnailyfacter::upgrade::restart_services' :} +class { '::osnailyfacter::override_resources': }