leg-kolla: simplify Linaro profile and drop monasca-grafana

We do not have to list each image - names from profile are used in
regexp so all subimages are included.

Also get rid of impossible to build 'monasca-grafana' image by marking
'grafana' to be exact that one.

Change-Id: I437491fc9d4358d5e0c914b9b149929d7fceede0

1 files changed, 1 insertions, 1 deletions

diff --git a/leg-kolla/linaro.conf b/leg-kolla/linaro.conf
index 27a0203a..738b8149 100644
--- a/leg-kolla/linaro.conf
+++ b/leg-kolla/linaro.conf
@@ -1,3 +1,3 @@
 [profiles]
-linaro = almanach-api, almanach-collector, aodh-api, aodh-evaluator, aodh-expirer, aodh-listener, aodh-notifier, barbican-api, barbican-keystone-listener, barbican-worker, blazar-api, blazar-manager, ceilometer-central, ceilometer-compute, ceilometer-ipmi, ceilometer-notification, ceph-mds, ceph-mgr, ceph-mon, ceph-nfs, ceph-osd, ceph-rgw, cephfs-fuse, certmonger, chrony, cinder-api, cinder-backup, cinder-scheduler, cinder-volume, cloudkitty-api, cloudkitty-processor, collectd, congress-api, congress-datasource, congress-policy-engine, cron, designate-api, designate-backend-bind9, designate-central, designate-mdns, designate-pool-manager, designate-producer, designate-sink, designate-worker, dnsmasq, dragonflow-controller, dragonflow-metadata, dragonflow-publisher-service, ec2-api, elasticsearch, glance-api, glance-registry, gnocchi-api, gnocchi-metricd, gnocchi-statsd, grafana, haproxy, heat-all, heat-api, heat-api-cfn, heat-engine, helm-repository, horizon, influxdb, ironic-api, ironic-conductor, ironic-inspector, ironic-pxe, iscsid, kafka, karbor-api, karbor-operationengine, karbor-protection, keepalived, keystone, keystone-fernet, keystone-ssh, kibana, kolla-toolbox, kube-apiserver, kube-controller-manager, kube-discovery, kube-proxy, kube-scheduler, kubernetes-entrypoint, kubetoolbox, kuryr-libnetwork, magnum-api, magnum-conductor, manila-api, manila-data, manila-scheduler, manila-share, mariadb, memcached, mistral-api, mistral-engine, mistral-event-engine, mistral-executor, mongodb, multipathd, murano-api, murano-engine, neutron-bgp-dragent, neutron-dhcp-agent, neutron-l3-agent, neutron-lbaas-agent, neutron-linuxbridge-agent, neutron-metadata-agent, neutron-metadata-agent-ovn, neutron-metering-agent, neutron-openvswitch-agent, neutron-server, neutron-server-ovn, neutron-sfc-agent, neutron-sriov-agent, nova-api, nova-compute, nova-compute-ironic, nova-conductor, nova-consoleauth, nova-libvirt, nova-mksproxy, nova-novncproxy, nova-placement-api, nova-scheduler, nova-serialproxy, nova-spicehtml5proxy, nova-ssh, novajoin-notifier, novajoin-server, octavia-api, octavia-health-manager, octavia-housekeeping, octavia-worker, openvswitch-db-server, openvswitch-vswitchd, ovn-controller, ovn-nb-db-server, ovn-northd, ovn-sb-db-server, ovsdpdk, ovsdpdk-db, ovsdpdk-vswitchd, panko-api, prometheus-haproxy-exporter, prometheus-mysqld-exporter, prometheus-node-exporter, prometheus-server, prometheus-memcached-exporter, prometheus-alertmanager, ptp, rabbitmq, rally, redis, redis-sentinel, rsyslog, sahara-api, sahara-engine, searchlight-api, searchlight-listener, senlin-api, senlin-engine, solum-api, solum-conductor, solum-deployer, solum-worker, swift-account, swift-container, swift-object, swift-object-expirer, swift-proxy-server, swift-rsyncd, tacker-conductor, tacker-server, tempest, tgtd, trove-api, trove-conductor, trove-guestagent, trove-taskmanager, vitrage-api, vitrage-collector, vitrage-graph, vitrage-ml, vitrage-notifier, vmtp, watcher-api, watcher-applier, watcher-engine, zaqar, zookeeper, zun-api, zun-compute, zun-wsproxy
+linaro = almanach, aodh, barbican, blazar, ceilometer, ceph, certmonger, chrony, cinder, cloudkitty, collectd, congress, cron, designate, dnsmasq, dragonflow, ec2, elasticsearch, glance, gnocchi, ^grafana, haproxy, heat, helm, horizon, influxdb, ironic, iscsid, kafka, karbor, keepalived, keystone, kibana, kolla, kube, kubernetes, kubetoolbox, kuryr, magnum, manila, mariadb, memcached, mistral, mongodb, multipathd, murano, neutron, nova, novajoin, octavia, openvswitch, ovn, ovsdpdk, panko, prometheus, ptp, rabbitmq, rally, redis, rsyslog, sahara, searchlight, senlin, solum, swift, tacker, tempest, tgtd, trove, vitrage, vmtp, watcher, zaqar, zookeeper, zun,
 devcloud = cadvisor, ceilometer-central, ceilometer-compute, ceilometer-notification, ceph-mds, ceph-mgr, ceph-mon, ceph-osd, ceph-rgw, chrony, cinder-api, cinder-backup, cinder-scheduler, cinder-volume, cron, designate-api, designate-backend-bind9, designate-central, designate-pool-manager, designate-producer, designate-sink, designate-worker, dnsmasq, ec2-api, elasticsearch, glance-api, glance-registry, grafana, haproxy, horizon, iscsid, keepalived, keystone, keystone-fernet, keystone-ssh, kibana, kolla-toolbox, mariadb, memcached, multipathd, neutron-dhcp-agent, neutron-l3-agent, neutron-linuxbridge-agent, neutron-metadata-agent, neutron-metering-agent, neutron-openvswitch-agent, neutron-server, nova-api, nova-compute, nova-conductor, nova-consoleauth, nova-libvirt, nova-novncproxy, nova-placement-api, nova-scheduler, nova-serialproxy, nova-spicehtml5proxy, nova-ssh, openvswitch-db-server, openvswitch-vswitchd, prometheus-haproxy-exporter, prometheus-mysqld-exporter, prometheus-node-exporter, prometheus-server, prometheus-memcached-exporter, prometheus-alertmanager, prometheus-blackbox-exporter, ptp, rabbitmq, rally, rsyslog, swift-account, swift-container, swift-object, swift-object-expirer, swift-proxy-server, swift-rsyncd, tempest, tgtd, vmtp, zookeeper