summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2015-11-03 08:37:31 -0400
committerDevan Goodwin <dgoodwin@redhat.com>2015-11-03 08:37:31 -0400
commitf91c0cac0b6e671d5ad70543054a17178c5f0a46 (patch)
treef9839f38700e1628097ae9f1f8dd910e3dcd46bb
parent39250a47afca63ef0b5a73158a2c9b15443a4235 (diff)
downloadopenshift-f91c0cac0b6e671d5ad70543054a17178c5f0a46.tar.gz
openshift-f91c0cac0b6e671d5ad70543054a17178c5f0a46.tar.bz2
openshift-f91c0cac0b6e671d5ad70543054a17178c5f0a46.tar.xz
openshift-f91c0cac0b6e671d5ad70543054a17178c5f0a46.zip
Add a simple version for the installer config file.
-rw-r--r--utils/src/ooinstall/oo_config.py3
-rw-r--r--utils/test/oo_config_tests.py3
2 files changed, 6 insertions, 0 deletions
diff --git a/utils/src/ooinstall/oo_config.py b/utils/src/ooinstall/oo_config.py
index aa63180b5..4281947f1 100644
--- a/utils/src/ooinstall/oo_config.py
+++ b/utils/src/ooinstall/oo_config.py
@@ -12,6 +12,7 @@ PERSIST_SETTINGS = [
'ansible_log_path',
'variant',
'variant_version',
+ 'version',
]
REQUIRED_FACTS = ['ip', 'public_ip', 'hostname', 'public_hostname']
@@ -146,6 +147,8 @@ class OOConfig(object):
os.makedirs(self.settings['ansible_inventory_directory'])
if 'ansible_plugins_directory' not in self.settings:
self.settings['ansible_plugins_directory'] = resource_filename(__name__, 'ansible_plugins')
+ if 'version' not in self.settings:
+ self.settings['version'] = 'v1'
if 'ansible_callback_facts_yaml' not in self.settings:
self.settings['ansible_callback_facts_yaml'] = '%s/callback_facts.yaml' % \
diff --git a/utils/test/oo_config_tests.py b/utils/test/oo_config_tests.py
index b88218459..480560542 100644
--- a/utils/test/oo_config_tests.py
+++ b/utils/test/oo_config_tests.py
@@ -105,6 +105,7 @@ class LegacyOOConfigTests(OOInstallFixture):
def test_load_config_memory(self):
self.assertEquals('openshift-enterprise', self.cfg.settings['variant'])
self.assertEquals('3.0', self.cfg.settings['variant_version'])
+ self.assertEquals('v1', self.cfg.settings['version'])
self.assertEquals(3, len(self.cfg.hosts))
h1 = self.cfg.get_host('10.0.0.1')
@@ -152,6 +153,7 @@ class OOConfigTests(OOInstallFixture):
[host['ip'] for host in ooconfig.settings['hosts']])
self.assertEquals('openshift-enterprise', ooconfig.settings['variant'])
+ self.assertEquals('v1', ooconfig.settings['version'])
def test_load_complete_facts(self):
cfg_path = self.write_config(os.path.join(self.work_dir,
@@ -189,6 +191,7 @@ class OOConfigTests(OOInstallFixture):
self.assertTrue('ansible_ssh_user' in written_config)
self.assertTrue('variant' in written_config)
+ self.assertEquals('v1', written_config['version'])
# Some advanced settings should not get written out if they
# were not specified by the user: