Remove unused 'override.config.template'

Override templates have been ignored since Liberty.
Remove the unused files from the sourcetree and
last stale references from the code.

Change-Id: I17939dbafa229cccb2548aecc1f8f82ead2e70ef
Closes-Bug: 1575852
This commit is contained in:
Petr Malik 2016-04-27 14:14:19 -04:00
parent a3b3fcbd7d
commit 7859d49f14
15 changed files with 4 additions and 65 deletions

View File

@ -0,0 +1,4 @@
---
fixes:
- Remove unused 'override.config.template' files.
Bug 1575852

View File

@ -115,10 +115,6 @@ class SingleInstanceConfigTemplate(object):
return abs(hash(self.instance_id) % (2 ** 31))
class OverrideConfigTemplate(SingleInstanceConfigTemplate):
template_name = "override.config.template"
def _validate_datastore(datastore_manager):
try:
CONF.get(datastore_manager)

View File

@ -1,3 +0,0 @@
{% for key, value in overrides.iteritems() -%}
{{key}}: {{value}}
{% endfor %}

View File

@ -1,12 +0,0 @@
[mysqld]
{% for key, value in overrides.iteritems() -%}
{%- if value == True -%}
{{key}} = 1
{%- elif value == False -%}
{{key}} = 0
{%- elif value == "" -%}
{{key}}
{%- else -%}
{{key}}={{value}}
{%- endif %}
{% endfor %}

View File

@ -1,3 +0,0 @@
{% for key, value in overrides.iteritems() -%}
{{key}}: {{value}}
{% endfor %}

View File

@ -1,12 +0,0 @@
[mysqld]
{% for key, value in overrides.iteritems() -%}
{%- if value == True -%}
{{key}} = 1
{%- elif value == False -%}
{{key}} = 0
{%- elif value == "" -%}
{{key}}
{%- else -%}
{{key}}={{value}}
{%- endif %}
{% endfor %}

View File

@ -1,12 +0,0 @@
[mysqld]
{% for key, value in overrides.iteritems() -%}
{%- if value == True -%}
{{key}} = 1
{%- elif value == False -%}
{{key}} = 0
{%- elif value == "" -%}
{{key}}
{%- else -%}
{{key}}={{value}}
{%- endif %}
{% endfor %}

View File

@ -1,3 +0,0 @@
{% for key, value in overrides.iteritems() -%}
{{key}} = {{value}}
{% endfor %}

View File

@ -1,12 +0,0 @@
[mysqld]
{% for key, value in overrides.iteritems() -%}
{%- if value == True -%}
{{key}} = 1
{%- elif value == False -%}
{{key}} = 0
{%- elif value == "" -%}
{{key}}
{%- else -%}
{{key}}={{value}}
{%- endif %}
{% endfor %}

View File

@ -1,3 +0,0 @@
{% for key, value in overrides.iteritems() -%}
{{key}} {{value}}
{% endfor %}

View File

@ -390,7 +390,6 @@ class FreshInstanceTasksTest(trove_testtools.TestCase):
@patch.object(taskmanager_models.FreshInstanceTasks, '_create_server')
@patch.object(taskmanager_models.FreshInstanceTasks, '_guest_prepare')
@patch.object(template, 'SingleInstanceConfigTemplate')
@patch.object(template, 'OverrideConfigTemplate')
@patch.object(taskmanager_models.FreshInstanceTasks, '_create_dns_entry',
side_effect=TroveError)
@patch('trove.taskmanager.models.LOG')