Merge "Fixing acronym for BGPVPN composable service"

diff --cc overcloud-resource-registry-puppet.j2.yaml
index a97ae29,cfc438b..689d639
--- 1/overcloud-resource-registry-puppet.j2.yaml
--- 2/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@@ -143,9 -143,8 +143,9 @@@ resource_registry
    OS::TripleO::Services::HeatEngine: puppet/services/heat-engine.yaml
    OS::TripleO::Services::Kernel: puppet/services/kernel.yaml
    OS::TripleO::Services::MySQL: puppet/services/database/mysql.yaml
-   OS::TripleO::Services::NeutronBgpvpnApi: OS::Heat::None
+   OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None
    OS::TripleO::Services::NeutronDhcpAgent: puppet/services/neutron-dhcp.yaml
 +  OS::TripleO::Services::NeutronL2gwApi: OS::Heat::None
    OS::TripleO::Services::NeutronL3Agent: puppet/services/neutron-l3.yaml
    OS::TripleO::Services::NeutronMetadataAgent: puppet/services/neutron-metadata.yaml
    # FIXME(shardy) the duplicate NeutronServer line can be removed when we've updated

diff --cc roles_data.yaml
index 7ddb2ee,d91ac8f..d772135
--- 1/roles_data.yaml
--- 2/roles_data.yaml
+++ b/roles_data.yaml
@@@ -53,9 -53,8 +53,9 @@@
      - OS::TripleO::Services::HeatEngine
      - OS::TripleO::Services::MySQL
      - OS::TripleO::Services::MySQLClient
-     - OS::TripleO::Services::NeutronBgpvpnApi
+     - OS::TripleO::Services::NeutronBgpVpnApi
      - OS::TripleO::Services::NeutronDhcpAgent
 +    - OS::TripleO::Services::NeutronL2gwApi
      - OS::TripleO::Services::NeutronL3Agent
      - OS::TripleO::Services::NeutronMetadataAgent
      - OS::TripleO::Services::NeutronApi