update required packages for opstools support
the packages required for opstools support (fluentd, sensu, and related) were duplicated across all the overcloud elements. this consolidates the opstools packages into a single overcloud-opstools element and makes it a dependency of the overcloud-* elements. It also adds the missing fluentd secure-forward plugin package. Change-Id: I4df1bb0c4fdc3211ef32aaa112d1c46063c85309
This commit is contained in:
Lars Kellogg-Stedman
parent
8ee01a569c
commit
82ccb486c1
|
|
@ -1,3 +1,4 @@
|
|||
package-installs
|
||||
pkg-map
|
||||
overcloud-opstools
|
||||
overcloud-base
|
||||
|
|
|
|||
|
|
@ -1,6 +1,2 @@
|
|||
ceph_osd_package
|
||||
fluentd_package
|
||||
ntp_package
|
||||
oschecks_package
|
||||
rubygem_fluent_package
|
||||
sensu_package
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
{
|
||||
"default": {
|
||||
"ceph_osd_package": "ceph-osd",
|
||||
"fluentd_package": "fluentd",
|
||||
"ntp_package": "ntp",
|
||||
"oschecks_package": "osops-tools-monitoring-oschecks",
|
||||
"rubygem_fluent_package": "rubygem-fluent-plugin-add",
|
||||
"sensu_package": "sensu"
|
||||
"ntp_package": "ntp"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
package-installs
|
||||
pkg-map
|
||||
overcloud-opstools
|
||||
overcloud-base
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
cinder_package
|
||||
fluentd_package
|
||||
ntp_package
|
||||
oschecks_package
|
||||
rubygem_fluent_package
|
||||
sensu_package
|
||||
targetcli_package
|
||||
tgt_package
|
||||
|
|
|
|||
|
|
@ -1,11 +1,7 @@
|
|||
{
|
||||
"default": {
|
||||
"cinder_package": "openstack-cinder",
|
||||
"fluentd_package": "fluentd",
|
||||
"ntp_package": "ntp",
|
||||
"oschecks_package": "osops-tools-monitoring-oschecks",
|
||||
"rubygem_fluent_package": "rubygem-fluent-plugin-add",
|
||||
"sensu_package": "sensu",
|
||||
"targetcli_package": "targetcli",
|
||||
"tgt_package": "scsi-target-utils"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
package-installs
|
||||
pkg-map
|
||||
overcloud-opstools
|
||||
overcloud-base
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ ceilometer_compute_package
|
|||
ceph_package
|
||||
dpdk_package
|
||||
driverctl_package
|
||||
fluentd_package
|
||||
libvirt_package
|
||||
neutron_package
|
||||
neutron_ml2_package
|
||||
|
|
@ -12,7 +11,4 @@ nfs_package
|
|||
nova_compute_package
|
||||
ntp_package
|
||||
openvswitch_ovn_compute_package
|
||||
oschecks_package
|
||||
pacemaker_remote_package
|
||||
rubygem_fluent_package
|
||||
sensu_package
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
"ceph_package": "ceph",
|
||||
"dpdk_package": "dpdk",
|
||||
"driverctl_package": "driverctl",
|
||||
"fluentd_package": "fluentd",
|
||||
"libvirt_package": "libvirt",
|
||||
"neutron_package": "openstack-neutron",
|
||||
"neutron_ml2_package": "openstack-neutron-ml2",
|
||||
|
|
@ -15,9 +14,6 @@
|
|||
"nova_compute_package": "openstack-nova-compute",
|
||||
"ntp_package": "ntp",
|
||||
"openvswitch_ovn_compute_package": "openvswitch-ovn-host",
|
||||
"oschecks_package": "osops-tools-monitoring-oschecks",
|
||||
"pacemaker_remote_package": "pacemaker-remote",
|
||||
"rubygem_fluent_package": "rubygem-fluent-plugin-add",
|
||||
"sensu_package": "sensu"
|
||||
"pacemaker_remote_package": "pacemaker-remote"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
package-installs
|
||||
pkg-map
|
||||
overcloud-opstools
|
||||
overcloud-base
|
||||
|
|
|
|||
|
|
@ -3,7 +3,3 @@ contrail_config_package
|
|||
contrail_control_package
|
||||
contrail_database_package
|
||||
contrail_webui_package
|
||||
fluentd_package
|
||||
oschecks_package
|
||||
rubygem_fluent_package
|
||||
sensu_package
|
||||
|
|
|
|||
|
|
@ -4,10 +4,6 @@
|
|||
"contrail_config_package": "contrail-openstack-config",
|
||||
"contrail_control_package": "contrail-openstack-control",
|
||||
"contrail_database_package": "contrail-openstack-database",
|
||||
"contrail_webui_package": "contrail-openstack-webui",
|
||||
"fluentd_package": "fluentd",
|
||||
"oschecks_package": "osops-tools-monitoring-oschecks",
|
||||
"rubygem_fluent_package": "rubygem-fluent-plugin-add",
|
||||
"sensu_package": "sensu"
|
||||
"contrail_webui_package": "contrail-openstack-webui"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
package-installs
|
||||
pkg-map
|
||||
overcloud-opstools
|
||||
overcloud-base
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ certmonger
|
|||
cinder_package
|
||||
fence_agents_package
|
||||
fence_virt_package
|
||||
fluentd_package
|
||||
glance_package
|
||||
haproxy_package
|
||||
heat_api_cfn_package
|
||||
|
|
@ -62,7 +61,6 @@ nova_novncproxy_package
|
|||
nova_scheduler_package
|
||||
ntp_package
|
||||
openvswitch_ovn_controller_package
|
||||
oschecks_package
|
||||
pacemaker_package
|
||||
pcs_package
|
||||
proliantutils_package
|
||||
|
|
@ -72,12 +70,10 @@ python_memcached_package
|
|||
rabbitmq_server_package
|
||||
redis_client_package
|
||||
redis_server_package
|
||||
rubygem_fluent_package
|
||||
sahara_api_package
|
||||
sahara_engine_package
|
||||
sahara_package
|
||||
sahara_ui_package
|
||||
sensu_package
|
||||
trove_api_package
|
||||
trove_conductor_package
|
||||
trove_taskmanager_package
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
"dracclient_package": "python-dracclient",
|
||||
"fence_agents_package": "fence-agents-all",
|
||||
"fence_virt_package": "fence-virt",
|
||||
"fluentd_package": "fluentd",
|
||||
"glance_package": "openstack-glance",
|
||||
"gnocchi_api_package": "openstack-gnocchi-api",
|
||||
"gnocchi_indexer_package": "openstack-gnocchi-indexer-sqlalchemy",
|
||||
|
|
@ -67,7 +66,6 @@
|
|||
"ntp_package": "ntp",
|
||||
"openvswitch_ovn_controller_package": "openvswitch-ovn-central",
|
||||
"python_cradox_package": "python-cradox",
|
||||
"oschecks_package": "osops-tools-monitoring-oschecks",
|
||||
"python_openstackclient_package": "python-openstackclient",
|
||||
"python_memcached_package": "python-memcached",
|
||||
"pacemaker_package": "pacemaker",
|
||||
|
|
@ -76,12 +74,10 @@
|
|||
"rabbitmq_server_package": "rabbitmq-server",
|
||||
"redis_client_package": "python-redis",
|
||||
"redis_server_package": "redis",
|
||||
"rubygem_fluent_package": "rubygem-fluent-plugin-add",
|
||||
"sahara_package": "openstack-sahara",
|
||||
"sahara_api_package": "openstack-sahara-api",
|
||||
"sahara_engine_package": "openstack-sahara-engine",
|
||||
"sahara_ui_package": "openstack-sahara-ui",
|
||||
"sensu_package": "sensu",
|
||||
"trove_api_package": "openstack-trove-api",
|
||||
"trove_conductor_package": "openstack-trove-conductor",
|
||||
"trove_taskmanager_package": "openstack-trove-taskmanager",
|
||||
|
|
|
|||
|
|
@ -2,4 +2,5 @@ package-installs
|
|||
pkg-map
|
||||
puppet
|
||||
source-repositories
|
||||
overcloud-opstools
|
||||
overcloud-base
|
||||
|
|
|
|||
|
|
@ -3,13 +3,9 @@ augeasdevel_package
|
|||
biosdevname
|
||||
cassandra_package
|
||||
deltarpm_package
|
||||
fluentd_package
|
||||
midonet_cli_package
|
||||
midonet_cluster_package
|
||||
midonet_package
|
||||
rubydevel_package
|
||||
rubygem_fluent_package
|
||||
rubygem_json_package
|
||||
oschecks_package
|
||||
sensu_package
|
||||
zookeeper_package
|
||||
|
|
|
|||
|
|
@ -5,15 +5,11 @@
|
|||
"biosdevname": "biosdevname",
|
||||
"cassandra_package": "dsc20",
|
||||
"deltarpm_package": "deltarpm",
|
||||
"fluentd_package": "fluentd",
|
||||
"midonet_cli_package": "python-midonetclient",
|
||||
"midonet_cluster_package": "midonet-cluster",
|
||||
"midonet_package": "midolman",
|
||||
"rubydevel_package": "ruby-devel",
|
||||
"rubygem_fluent_package": "rubygem-fluent-plugin-add",
|
||||
"rubygem_json_package": "rubygem-json",
|
||||
"oschecks_package": "osops-tools-monitoring-oschecks",
|
||||
"sensu_package": "sensu",
|
||||
"zookeeper_package": "zookeeper"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
Install all packages required for opstools (logging and monitoring)
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
package-installs
|
||||
pkg-map
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
fluentd_package
|
||||
fluent_plugin_add_package
|
||||
fluent_plugin_secure_forward_package
|
||||
oschecks_package
|
||||
sensu_package
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"default": {
|
||||
"fluentd_package": "fluentd",
|
||||
"fluent_plugin_add_package": "rubygem-fluent-plugin-add",
|
||||
"fluent_plugin_secure_forward_package": "rubygem-fluent-plugin-secure-forward",
|
||||
"oschecks_package": "osops-tools-monitoring-oschecks",
|
||||
"sensu_package": "sensu"
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue