Remove Openstack and Ceph packages attempt 2

As we've switched to containers, it's time to start cleaning up the
packages we install on the overcloud images by default. This change
removes all the openstack and ceph packages from the
overcloud-controller, overcloud-ceph-storage and overcloud-compute
elements.

This reverts commit c69d6dd2c9. The
previous attempt was reverted due to an invalid json in the overcloud
pkg-map. This trailing comma has been addressed in this revert.

Change-Id: I5ceb329e18024040697ad5eab892d13c51ad276f
Related-Blueprint: cleanup-overcloud-images

elements/overcloud-base/install.d/package-installs-overcloud-base

@@ -7,3 +7,4 @@ python_docker_py
 python_ipaddr
 openstack_selinux
 net_snmp
+iptables_services

elements/overcloud-base/pkg-map

@@ -9,6 +9,7 @@
     "python_ipaddr": "python-ipaddr",
     "openstack_selinux": "openstack-selinux",
     "net_snmp": "net-snmp",
-    "yum_plugin_priorities_package": "yum-plugin-priorities"
+    "yum_plugin_priorities_package": "yum-plugin-priorities",
+    "iptables_services": "iptables-services"
   }
 }

elements/overcloud-ceph-storage/install.d/package-installs-overcloud-ceph-storage

@@ -1,2 +1 @@
-ceph_osd_package
 ntp_package

elements/overcloud-ceph-storage/pkg-map

@@ -1,6 +1,5 @@
 {
   "default": {
-    "ceph_osd_package": "ceph-osd",
     "ntp_package": "ntp"
   }
 }

elements/overcloud-compute/install.d/package-installs-overcloud-compute

@@ -1,22 +1,8 @@
-bagpipe_agent_package
-ceilometer_compute_package
-ceph_package
 dpdk_package
 driverctl_package
 libvirt_package
-networking_bagpipe_package
-networking_ovn_metadata_package
-networking_sfc_package
-neutron_package
-neutron_ml2_package
-neutron_linuxbridge_package
-neutron_openvswitch_package
-neutron_sriov_agent_package
 nfs_package
-nova_compute_package
-nova_migration_package
 ntp_package
-openvswitch_ovn_compute_package
 pacemaker_remote_package
 sasl_scram_package
 skydive_package

elements/overcloud-compute/pkg-map

@@ -1,25 +1,10 @@
 {
   "default": {
-    "bagpipe_agent_package": "openstack-bagpipe-bgp",
-    "ceilometer_compute_package": "openstack-ceilometer-compute",
-    "ceph_package": "ceph",
     "dpdk_package": "dpdk",
     "driverctl_package": "driverctl",
     "libvirt_package": "libvirt",
-    "networking_bagpipe_package": "python-networking-bagpipe",
-    "neutron_package": "openstack-neutron",
-    "neutron_ml2_package": "openstack-neutron-ml2",
-    "neutron_linuxbridge_package": "openstack-neutron-linuxbridge",
-    "neutron_openvswitch_package": "openstack-neutron-openvswitch",
-    "neutron_package": "openstack-neutron",
-    "neutron_sriov_agent_package": "openstack-neutron-sriov-nic-agent",
-    "networking_ovn_metadata_package": "python-networking-ovn-metadata-agent",
-    "networking_sfc_package": "python-networking-sfc",
     "nfs_package": "nfs-utils",
-    "nova_compute_package": "openstack-nova-compute",
-    "nova_migration_package": "openstack-nova-migration",
     "ntp_package": "ntp",
-    "openvswitch_ovn_compute_package": "openvswitch-ovn-host",
     "pacemaker_remote_package": "pacemaker-remote",
     "sasl_scram_package": "cyrus-sasl-scram",
     "skydive_package": "skydive",

elements/overcloud-controller/install.d/package-installs-overcloud-controller

@@ -1,113 +1,32 @@
-aodh_api_package
-aodh_notifier_package
-aodh_evaluator_package
-aodh_listener_package
-barbican_api_package
-ceilometer_central_package
-ceilometer_notification_package
-ceilometer_ipmi_package
-congress_package
 cyrus_sasl_plain_package
 dracclient_package
-gnocchi_api_package
-gnocchi_indexer_package
-gnocchi_statsd_package
-gnocchi_metricd_package
-ceph_mon_package
-ceph_mds_package
-ceph_rbd_mirror_package
-ceph_rgw_package
 certmonger
-cinder_package
-ec2_api_package
 etcd_package
 fence_agents_package
 fence_virt_package
-glance_package
 haproxy_package
-heat_api_cfn_package
-heat_api_package
-heat_engine_package
-horizon_package
 ipa_admintools_package
 ipa_client_package
 ipxe_bootimgs_package
-ironic_api_package
-ironic_conductor_package
-ironic_inspector_package
-iscsi_package
-keystone_package
-manila_package
-manila_share_package
-manila_ui_package
 mariadb_package
 mariadb_server_package
-mistral_api_package
-mistral_common_package
-mistral_engine_package
-mistral_event_engine_package
-mistral_executor_package
 mod_auth_mellon_package
 mod_ssl_package
 mongodb_client_package
 mongodb_server_package
-memcached_package
-neutron_metering_package
-neutron_lbaas_package
-neutron_lbaas_ui_package
-neutron_linuxbridge_package
-neutron_l2gw_package
-neutron_ml2_package
-neutron_openvswitch_package
-neutron_package
-networking_bagpipe_package
-networking_bgpvpn_package
-networking_l2gw_package
-networking_odl_package
-networking_ovn_package
-networking_sfc_package
 nfs_package
-nova_api_package
-nova_conductor_package
-nova_console_package
-nova_novncproxy_package
-nova_placement_package
-nova_scheduler_package
 ntp_package
-octavia_common_package
-octavia_api_package
-octavia_worker_package
-octavia_health_manager_package
-octavia_housekeeping_package
-openvswitch_ovn_controller_package
 pacemaker_package
 pcs_package
 proliantutils_package
-panko_api_package
 python_cradox_package
 python_openstackclient_package
 python_memcached_package
-qpid_dispatch_router_package
-qpid_dispatch_tools_package
-rabbitmq_server_package
 redis_client_package
 redis_server_package
-sahara_api_package
-sahara_engine_package
-sahara_package
-sahara_ui_package
 socat_package
 stunnel_package
 sushy_package
-tacker_package
-trove_api_package
-trove_conductor_package
-trove_taskmanager_package
-swift_account_package
-swift_container_package
-swift_object_package
-swift_plugin_swift3_package
-swift_proxy_package
 targetcli_package
 tftp_server_package
 vitrage_api_package
@@ -116,4 +35,3 @@ vitrage_graph_package
 vitrage_persistor_package
 vitrage_notifier_package
 xinetd_package
-zaqar_package

elements/overcloud-controller/pkg-map

@@ -1,89 +1,25 @@
 {
   "default": {
-    "aodh_api_package": "openstack-aodh-api",
-    "aodh_notifier_package": "openstack-aodh-notifier",
-    "aodh_evaluator_package": "openstack-aodh-evaluator",
-    "aodh_listener_package": "openstack-aodh-listener",
-    "barbican_api_package": "openstack-barbican-api",
-    "ceilometer_central_package": "openstack-ceilometer-central",
-    "ceilometer_notification_package": "openstack-ceilometer-notification",
-    "ceilometer_ipmi_package": "openstack-ceilometer-ipmi",
-    "ceph_mon_package": "ceph-mon",
-    "ceph_mds_package": "ceph-mds",
-    "ceph_rbd_mirror_package": "rbd-mirror",
-    "ceph_rgw_package": "ceph-radosgw",
     "certmonger": "certmonger",
-    "cinder_package": "openstack-cinder",
-    "congress_package": "openstack-congress",
     "cyrus_sasl_plain_package": "cyrus-sasl-plain",
     "dracclient_package": "python-dracclient",
-    "ec2_api_package": "openstack-ec2-api",
     "etcd_package": "etcd",
     "fence_agents_package": "fence-agents-all",
     "fence_virt_package": "fence-virt",
-    "glance_package": "openstack-glance",
-    "gnocchi_api_package": "openstack-gnocchi-api",
-    "gnocchi_indexer_package": "openstack-gnocchi-indexer-sqlalchemy",
-    "gnocchi_statsd_package": "openstack-gnocchi-statsd",
-    "gnocchi_metricd_package": "openstack-gnocchi-metricd",
     "haproxy_package": "haproxy",
-    "heat_api_cfn_package": "openstack-heat-api-cfn",
-    "heat_api_package": "openstack-heat-api",
-    "heat_engine_package": "openstack-heat-engine",
-    "horizon_package": "openstack-dashboard",
     "ipa_admintools_package": "ipa-admintools",
     "ipa_client_package": "ipa-client",
     "ipxe_bootimgs_package": "ipxe-bootimgs",
-    "ironic_api_package": "openstack-ironic-api",
-    "ironic_conductor_package": "openstack-ironic-conductor",
-    "ironic_inspector_package": "openstack-ironic-inspector",
     "iscsi_package": "iscsi-initiator-utils",
-    "keystone_package": "openstack-keystone",
-    "manila_package": "openstack-manila",
-    "manila_share_package": "openstack-manila-share",
-    "manila_ui_package": "openstack-manila-ui",
     "mariadb_package": "mariadb",
     "mariadb_server_package": "mariadb-galera-server",
     "memcached_package": "memcached",
-    "mistral_all_package": "openstack-mistral-all",
-    "mistral_api_package": "openstack-mistral-api",
-    "mistral_common_package": "openstack-mistral-common",
-    "mistral_engine_package": "openstack-mistral-engine",
-    "mistral_event_engine_package": "openstack-mistral-event-engine",
-    "mistral_executor_package": "openstack-mistral-executor",
     "mod_auth_mellon_package": "mod_auth_mellon",
     "mod_ssl_package": "mod_ssl",
     "mongodb_client_package": "mongodb",
     "mongodb_server_package": "mongodb-server",
-    "neutron_metering_package": "openstack-neutron-metering-agent",
-    "neutron_lbaas_package": "openstack-neutron-lbaas",
-    "neutron_lbaas_ui_package": "openstack-neutron-lbaas-ui",
-    "neutron_linuxbridge_package": "openstack-neutron-linuxbridge",
-    "neutron_l2gw_package": "openstack-neutron-l2gw-agent",
-    "neutron_ml2_package": "openstack-neutron-ml2",
-    "neutron_openvswitch_package": "openstack-neutron-openvswitch",
-    "neutron_package": "openstack-neutron",
-    "networking_bagpipe_package": "python-networking-bagpipe",
-    "networking_bgpvpn_package": "python-networking-bgpvpn",
-    "networking_l2gw_package": "python-networking-l2gw",
-    "networking_odl_package": "python-networking-odl",
-    "networking_ovn_package": "python-networking-ovn",
-    "networking_sfc_package": "python-networking-sfc",
     "nfs_package": "nfs-utils",
-    "nova_api_package": "openstack-nova-api",
-    "nova_conductor_package": "openstack-nova-conductor",
-    "nova_console_package": "openstack-nova-console",
-    "nova_novncproxy_package": "openstack-nova-novncproxy",
-    "nova_placement_package": "openstack-nova-placement-api",
-    "nova_scheduler_package": "openstack-nova-scheduler",
     "ntp_package": "ntp",
-    "octavia_common_package": "openstack-octavia-common",
-    "octavia_api_package": "openstack-octavia-api",
-    "octavia_worker_package": "openstack-octavia-worker",
-    "octavia_health_manager_package": "openstack-octavia-health-manager",
-    "octavia_housekeeping_package": "openstack-octavia-housekeeping",
-    "openvswitch_ovn_controller_package": "openvswitch-ovn-central",
-    "panko_api_package": "openstack-panko-api",
     "python_cradox_package": "python-cradox",
     "python_openstackclient_package": "python-openstackclient",
     "python_memcached_package": "python-memcached",
@@ -95,30 +31,11 @@
     "rabbitmq_server_package": "rabbitmq-server",
     "redis_client_package": "python-redis",
     "redis_server_package": "redis",
-    "sahara_package": "openstack-sahara",
-    "sahara_api_package": "openstack-sahara-api",
-    "sahara_engine_package": "openstack-sahara-engine",
-    "sahara_ui_package": "openstack-sahara-ui",
     "socat_package": "socat",
     "stunnel_package": "stunnel",
     "sushy_package": "python-sushy",
-    "trove_api_package": "openstack-trove-api",
-    "trove_conductor_package": "openstack-trove-conductor",
-    "trove_taskmanager_package": "openstack-trove-taskmanager",
-    "swift_account_package": "openstack-swift-account",
-    "swift_container_package": "openstack-swift-container",
-    "swift_object_package": "openstack-swift-object",
-    "swift_plugin_swift3_package": "openstack-swift-plugin-swift3",
-    "swift_proxy_package": "openstack-swift-proxy",
     "targetcli_package": "targetcli",
-    "tacker_package": "openstack-tacker",
     "tftp_server_package": "tftp-server",
-    "vitrage_api_package": "openstack-vitrage-api",
+    "xinetd_package": "xinetd"
-    "vitrage_collector_package": "openstack-vitrage-collector",
-    "vitrage_graph_package": "openstack-vitrage-graph",
-    "vitrage_persistor_package": "openstack-vitrage-persistor",
-    "vitrage_notifier_package": "openstack-vitrage-notifier",
-    "xinetd_package": "xinetd",
-    "zaqar_package": "openstack-zaqar"
   }
 }