Merge "Update docker compute environment to use json config"

diff --cc docker/firstboot/start_docker_agents.sh
Simple merge

diff --cc environments/docker-rdo.yaml
index 8a6e101,5c9f1cb..f42dc58
--- 1/environments/docker-rdo.yaml
--- 2/environments/docker-rdo.yaml
+++ b/environments/docker-rdo.yaml
@@@ -5,13 -5,14 +5,14 @@@ resource_registry
    OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml
  
  parameters:
 -  NovaImage: fedora-atomic
 +  NovaImage: atomic-image
  
+ # FIXME: When Kolla cuts liberty tag we can use kollaglue registry
  parameter_defaults:
    DockerComputeImage: rthallisey/centos-binary-nova-compute:liberty
-   DockerComputeDataImage: kollaglue/centos-rdo-nova-compute-data:liberty2
-   DockerLibvirtImage: kollaglue/centos-rdo-nova-libvirt:liberty2
-   DockerNeutronAgentImage: kollaglue/centos-rdo-neutron-agents:liberty2
-   DockerOpenvswitchImage: rthallisey/centos-rdo-neutron-openvswitch-agent:latest
-   DockerOvsVswitchdImage: kollaglue/centos-rdo-ovs-vswitchd:liberty2
-   DockerOpenvswitchDBImage: kollaglue/centos-rdo-ovs-db-server:liberty2
+   DockerComputeDataImage: rthallisey/centos-binary-data:liberty
+   DockerLibvirtImage: rthallisey/centos-binary-nova-libvirt:liberty
+   DockerNeutronAgentImage: rthallisey/centos-binary-neutron-agents:liberty
+   DockerOpenvswitchImage: rthallisey/centos-binary-neutron-openvswitch-agent:liberty
+   DockerOvsVswitchdImage: rthallisey/centos-binary-openvswitch-vswitchd:liberty
+   DockerOpenvswitchDBImage: rthallisey/centos-binary-openvswitch-db-server:liberty