Merge "Bump template version for all templates to "ocata""

diff --cc docker/post.j2.yaml
Simple merge

diff --cc network/service_net_map.j2.yaml
Simple merge

diff --cc puppet/services/aodh-api.yaml
Simple merge

diff --cc puppet/services/neutron-plugin-ml2-ovn.yaml
Simple merge

diff --cc puppet/services/nova-base.yaml
Simple merge