Merge "all.yml should be in alphabetical order"

ansible/group_vars/all.yml

@@ -130,12 +130,15 @@ tunnel_interface_address: "{{ hostvars[inventory_hostname]['ansible_' + tunnel_i
 neutron_plugin_agent: "openvswitch"
 
 # The default ports used by each service.
+# The list should be in alphabetical order
 aodh_api_port: "8042"
 
 barbican_api_port: "9311"
 
 ceilometer_api_port: "8777"
 
+cinder_api_port: "8776"
+
 congress_api_port: "1789"
 
 cloudkitty_api_port: "8889"
@@ -145,124 +148,121 @@ designate_bind_port: "53"
 designate_mdns_port: "5354"
 designate_rndc_port: "953"
 
+elasticsearch_port: "9200"
+
+etcd_client_port: "2379"
+etcd_peer_port: "2380"
+
+fluentd_syslog_port: "5140"
+
 freezer_api_port: "9090"
 
-iscsi_port: "3260"
+glance_api_port: "9292"
+glance_registry_port: "9191"
 
 gnocchi_api_port: "8041"
 
-mariadb_port: "{{ database_port }}"
-mariadb_wsrep_port: "4567"
-mariadb_ist_port: "4568"
-mariadb_sst_port: "4444"
+grafana_server_port: "3000"
 
-panko_api_port: "8977"
+haproxy_stats_port: "1984"
 
-rabbitmq_port: "5672"
-rabbitmq_management_port: "15672"
-rabbitmq_cluster_port: "25672"
-rabbitmq_epmd_port: "4369"
+heat_api_port: "8004"
+heat_api_cfn_port: "8000"
 
-rdp_port: "8001"
+horizon_port: "80"
 
-outward_rabbitmq_port: "5674"
-outward_rabbitmq_management_port: "15674"
-outward_rabbitmq_cluster_port: "25674"
-outward_rabbitmq_epmd_port: "4371"
+influxdb_admin_port: "8083"
+influxdb_http_port: "8086"
 
-mongodb_port: "27017"
-mongodb_web_port: "28017"
+ironic_api_port: "6385"
+ironic_inspector_port: "5050"
 
-haproxy_stats_port: "1984"
+iscsi_port: "3260"
+
+karbor_api_port: "8799"
 
 keystone_public_port: "5000"
 keystone_admin_port: "35357"
 keystone_ssh_port: "8023"
 
-glance_api_port: "9292"
-glance_registry_port: "9191"
-
-octavia_api_port: "9876"
-octavia_health_manager_port: "5555"
+kibana_server_port: "5601"
 
-placement_api_port: "8780"
+kuryr_port: "23750"
 
-nova_api_port: "8774"
-nova_metadata_port: "8775"
-nova_novncproxy_port: "6080"
-nova_spicehtml5proxy_port: "6082"
-nova_serialproxy_port: "6083"
+magnum_api_port: "9511"
 
-neutron_server_port: "9696"
+manila_api_port: "8786"
 
-cinder_api_port: "8776"
+mariadb_port: "{{ database_port }}"
+mariadb_wsrep_port: "4567"
+mariadb_ist_port: "4568"
+mariadb_sst_port: "4444"
 
 memcached_port: "11211"
 
-swift_proxy_server_port: "8080"
-swift_object_server_port: "6000"
-swift_account_server_port: "6001"
-swift_container_server_port: "6002"
-swift_rsync_port: "10873"
-
-sahara_api_port: "8386"
-
-heat_api_port: "8004"
-heat_api_cfn_port: "8000"
+mistral_api_port: "8989"
 
-horizon_port: "80"
+mongodb_port: "27017"
+mongodb_web_port: "28017"
 
 murano_api_port: "8082"
 
-ironic_api_port: "6385"
-ironic_inspector_port: "5050"
-
-magnum_api_port: "9511"
-
-solum_application_deployment_port: "9777"
+neutron_server_port: "9696"
 
-solum_image_builder_port: "9778"
+nova_api_port: "8774"
+nova_metadata_port: "8775"
+nova_novncproxy_port: "6080"
+nova_spicehtml5proxy_port: "6082"
+nova_serialproxy_port: "6083"
 
-rgw_port: "6780"
+octavia_api_port: "9876"
+octavia_health_manager_port: "5555"
 
-mistral_api_port: "8989"
+outward_rabbitmq_port: "5674"
+outward_rabbitmq_management_port: "15674"
+outward_rabbitmq_cluster_port: "25674"
+outward_rabbitmq_epmd_port: "4371"
 
-kibana_server_port: "5601"
+ovsdb_port: "6640"
 
-elasticsearch_port: "9200"
+panko_api_port: "8977"
 
-manila_api_port: "8786"
+placement_api_port: "8780"
 
-watcher_api_port: "9322"
+rabbitmq_port: "5672"
+rabbitmq_management_port: "15672"
+rabbitmq_cluster_port: "25672"
+rabbitmq_epmd_port: "4369"
 
-influxdb_admin_port: "8083"
-influxdb_http_port: "8086"
+rdp_port: "8001"
 
-senlin_api_port: "8778"
+rgw_port: "6780"
 
-trove_api_port: "8779"
+sahara_api_port: "8386"
 
-etcd_client_port: "2379"
-etcd_peer_port: "2380"
+searchlight_api_port: "9393"
 
-karbor_api_port: "8799"
+senlin_api_port: "8778"
 
-kuryr_port: "23750"
+skydive_analyzer_port: "8085"
+skydive_agents_port: "8090"
 
-searchlight_api_port: "9393"
+solum_application_deployment_port: "9777"
+solum_image_builder_port: "9778"
 
-grafana_server_port: "3000"
+swift_proxy_server_port: "8080"
+swift_object_server_port: "6000"
+swift_account_server_port: "6001"
+swift_container_server_port: "6002"
+swift_rsync_port: "10873"
 
 tacker_server_port: "9890"
 
-fluentd_syslog_port: "5140"
-
-zun_api_port: "9517"
+trove_api_port: "8779"
 
-ovsdb_port: "6640"
+watcher_api_port: "9322"
 
-skydive_analyzer_port: "8085"
-skydive_agents_port: "8090"
+zun_api_port: "9517"
 
 
 public_protocol: "{{ 'https' if kolla_enable_tls_external | bool else 'http' }}"