Rename NeutronServer to NeutronApi to align with ServiceNetMap

The new composable service name conflicts with the existing ServiceNetMap
naming, so align with NeutronApi since ServiceNetMap exists in current
released versions.

This is required so we can correctly generate the neutron_api_node_ips
list (needed by puppet-tripleo) based on the service_name.

Change-Id: Ic1d45cbaa77bc6ac9ca247c880a9845ca49905da
Partially-Implements: blueprint custom-roles

1 files changed, 0 insertions, 102 deletions

diff --git a/puppet/services/neutron-server.yaml b/puppet/services/neutron-server.yaml
deleted file mode 100644
index c40b37b0..00000000
--- a/puppet/services/neutron-server.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-heat_template_version: 2016-04-08
-
-description: >
-  OpenStack Neutron Server configured with Puppet
-
-parameters:
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-  NeutronWorkers:
-    default: 0
-    description: Number of workers for Neutron service.
-    type: number
-  NeutronPassword:
-    description: The password for the neutron service and db account, used by neutron agents.
-    type: string
-    hidden: true
-  NeutronAllowL3AgentFailover:
-    default: 'True'
-    description: Allow automatic l3-agent failover
-    type: string
-  NeutronL3HA:
-    default: false
-    description: Whether to enable HA for virtual routers
-    type: boolean
-  NovaPassword:
-    description: The password for the nova service and db account, used by nova-api.
-    type: string
-    hidden: true
-  NeutronEnableDVR:
-    description: Enable Neutron DVR.
-    default: false
-    type: boolean
-  KeystoneRegion:
-    type: string
-    default: 'regionOne'
-    description: Keystone region for endpoint
-
-resources:
-
-  NeutronBase:
-    type: ./neutron-base.yaml
-
-outputs:
-  role_data:
-    description: Role data for the Neutron Server agent service.
-    value:
-      service_name: neutron_server
-      config_settings:
-        map_merge:
-          - get_attr: [NeutronBase, role_data, config_settings]
-            neutron::server::database_connection:
-              list_join:
-                - ''
-                - - {get_param: [EndpointMap, MysqlInternal, protocol]}
-                  - '://neutron:'
-                  - {get_param: NeutronPassword}
-                  - '@'
-                  - {get_param: [EndpointMap, MysqlInternal, host]}
-                  - '/ovs_neutron'
-            neutron::keystone::auth::tenant: 'service'
-            neutron::keystone::auth::public_url: {get_param: [EndpointMap, NeutronPublic, uri]}
-            neutron::keystone::auth::internal_url: { get_param: [ EndpointMap, NeutronInternal, uri ] }
-            neutron::keystone::auth::admin_url: { get_param: [ EndpointMap, NeutronAdmin, uri ] }
-            neutron::keystone::auth::password: {get_param: NeutronPassword}
-            neutron::keystone::auth::region: {get_param: KeystoneRegion}
-            neutron::server::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
-            neutron::server::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
-            neutron::server::api_workers: {get_param: NeutronWorkers}
-            neutron::server::allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
-            neutron::server::l3_ha: {get_param: NeutronL3HA}
-            neutron::server::password: {get_param: NeutronPassword}
-
-            neutron::server::notifications::nova_url: { get_param: [ EndpointMap, NovaInternal, uri ] }
-            neutron::server::notifications::auth_url: { get_param: [ EndpointMap, KeystoneV3Admin, uri ] }
-            neutron::server::notifications::tenant_name: 'service'
-            neutron::server::notifications::project_name: 'service'
-            neutron::server::notifications::password: {get_param: NovaPassword}
-            neutron::server::project_name: 'service'
-            neutron::server::sync_db: true
-            neutron::db::mysql::password: {get_param: NeutronPassword}
-            neutron::db::mysql::user: neutron
-            neutron::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
-            neutron::db::mysql::dbname: ovs_neutron
-            neutron::db::mysql::allowed_hosts:
-              - '%'
-              - "%{hiera('mysql_bind_host')}"
-            tripleo.neutron_server.firewall_rules:
-              '114 neutron server':
-                dport:
-                  - 9696
-                  - 13696
-              '118 neutron vxlan networks':
-                proto: 'udp'
-                dport: 4789
-              '106 vrrp':
-                proto: vrrp
-            neutron::server::router_distributed: {get_param: NeutronEnableDVR}
-      step_config: |
-        include tripleo::profile::base::neutron::server