Open Stack

On 08/12/2014 05:21 PM, Robert Collins wrote:
> Just ran into a merge conflict with
> https://review.openstack.org/#/c/105878/ which looks like this:
> 
>             - name: nova_osapi
>               port: 8774
>               net_binds: *public_binds
>             - name: nova_metadata
>               port: 8775
>               net_binds: *public_binds
>             - name: ceilometer
>               port: 8777
>               net_binds: *public_binds
>             - name: swift_proxy_server
>               port: 8080
>               net_binds: *public_binds
> <<<<<<< HEAD
>             - name: rabbitmq
>               port: 5672
>               options:
>                 - timeout client 0
>                 - timeout server 0
> =======
>             - name: mysql
>               port: 3306
>               extra_server_params:
>                 - backup
>>>>>>>> Change overcloud to use VIP for MySQL
> 
> I'd like to propose that we make it a standard - possibly lint on it,
> certainly fixup things when we see its wrong - to alpha-sort such
> structures: that avoids the textual-merge failure mode of 'append to
> the end'.
> 
> -Rob
> 

Works for me.  At the very least we could add it to the new guidelines
that are proposed: https://review.openstack.org/#/c/110565/

-Ben