Merge "Drop extraconfig for neutron-opencontrail.yaml"

1 files changed, 0 insertions, 62 deletions

diff --git a/puppet/extraconfig/pre_deploy/controller/neutron-opencontrail.yaml b/puppet/extraconfig/pre_deploy/controller/neutron-opencontrail.yaml
deleted file mode 100644
index 5c686fe7..00000000
--- a/puppet/extraconfig/pre_deploy/controller/neutron-opencontrail.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-heat_template_version: 2015-04-30
-
-description: Controller hieradata for Neutron OpenContrail configuration
-
-parameters:
-  server:
-    description: ID of the controller node to apply this config to
-    type: string
-  ContrailApiServerIp:
-    description: IP address of the OpenContrail API server
-    type: string
-  ContrailApiServerPort:
-    description: Port of the OpenContrail API
-    type: string
-    default: 8082
-  ContrailMultiTenancy:
-    description: Whether to enable multi tenancy
-    type: boolean
-    default: false
-  ContrailExtensions:
-    description: List of OpenContrail extensions to be enabled
-    type: comma_delimited_list
-    default: ''
-
-resources:
-  ControllerContrailConfig:
-    type: OS::Heat::StructuredConfig
-    properties:
-      group: os-apply-config
-      config:
-        hiera:
-          datafiles:
-            neutron_opencontrail_data:
-              mapped_data:
-                neutron::api_extensions_path: /usr/lib/python2.7/site-packages/neutron_plugin_contrail/extensions
-
-                neutron::plugins::opencontrail::api_server_ip: {get_input: contrail_api_server_ip}
-                neutron::plugins::opencontrail::api_server_port: {get_input: contrail_api_server_port}
-                neutron::plugins::opencontrail::multi_tenancy: {get_input: contrail_multi_tenancy}
-                neutron::plugins::opencontrail::contrail_extensions: {get_input: contrail_extensions}
-                neutron::plugins::opencontrail::keystone_auth_url: '"%{hiera(''keystone_auth_uri'')}"'
-                neutron::plugins::opencontrail::keystone_admin_user: admin
-                neutron::plugins::opencontrail::keystone_admin_tenant_name: admin
-                neutron::plugins::opencontrail::keystone_admin_password: '"%{hiera(''admin_password'')}"'
-                neutron::plugins::opencontrail::keystone_admin_token: '"%{hiera(''keystone::admin_token'')}"'
-
-  ControllerContrailDeployment:
-    type: OS::Heat::StructuredDeployment
-    properties:
-      config: {get_resource: ControllerContrailConfig}
-      server: {get_param: server}
-      input_values:
-        contrail_api_server_ip: {get_param: ContrailApiServerIp}
-        contrail_api_server_port: {get_param: ContrailApiServerPort}
-        contrail_multi_tenancy: {get_param: ContrailMultiTenancy}
-        contrail_extensions: {get_param: ContrailExtensions}
-
-
-outputs:
-  deploy_stdout:
-    description: Output of the extra hiera data deployment
-    value: {get_attr: [ControllerContrailDeployment, deploy_stdout]}