From c0f566cc2e564d8c1ec58fd992e4280b98d9655c Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 18 May 2018 11:19:24 -0600 Subject: [PATCH] Start standalone.conf This is the start of a standalone.conf for use with the all in one installer. Change-Id: I656f4c1f7094b9a5981c1f15ff1c119693cd17c8 Related-Blueprint: all-in-one --- .gitignore | 3 +++ config-generator/standalone.conf | 3 +++ setup.cfg | 1 + tox.ini | 4 +++- tripleoclient/config/standalone.py | 7 +++++++ 5 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 config-generator/standalone.conf diff --git a/.gitignore b/.gitignore index 5760175ab..1649f470a 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,6 @@ ChangeLog # Files created by releasenotes build releasenotes/build + +# generated config samples +*.conf.sample diff --git a/config-generator/standalone.conf b/config-generator/standalone.conf new file mode 100644 index 000000000..46e272c44 --- /dev/null +++ b/config-generator/standalone.conf @@ -0,0 +1,3 @@ +[DEFAULT] +output_file = standalone.conf.sample +namespace = standalone_config diff --git a/setup.cfg b/setup.cfg index cd19aa625..c6ccc9971 100644 --- a/setup.cfg +++ b/setup.cfg @@ -100,3 +100,4 @@ openstack.tripleoclient.v1 = undercloud_backup = tripleoclient.v1.undercloud_backup:BackupUndercloud oslo.config.opts = undercloud_config = tripleoclient.v1.undercloud_config:list_opts + standalone_config = tripleoclient.config.standalone:list_opts diff --git a/tox.ini b/tox.ini index 120c45075..be8dd2dcd 100644 --- a/tox.ini +++ b/tox.ini @@ -60,7 +60,9 @@ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,rele [testenv:genconfig] setenv = HOME={env:HOME:/home/stack} -commands = oslo-config-generator --config-file config-generator/undercloud.conf +commands = + oslo-config-generator --config-file config-generator/undercloud.conf + oslo-config-generator --config-file config-generator/standalone.conf [testenv:releasenotes] deps = diff --git a/tripleoclient/config/standalone.py b/tripleoclient/config/standalone.py index ca988c1fd..3791e2d85 100644 --- a/tripleoclient/config/standalone.py +++ b/tripleoclient/config/standalone.py @@ -13,6 +13,8 @@ # under the License. # +import copy + from osc_lib.i18n import _ from oslo_config import cfg from tripleoclient.config.base import BaseConfig @@ -189,3 +191,8 @@ class StandaloneConfig(BaseConfig): def get_opts(self): return self.sort_opts(self.get_base_opts() + self.get_enable_service_opts()) + + +# this is needed for the oslo config generator +def list_opts(): + return [(None, copy.deepcopy(StandaloneConfig().get_opts()))]