expose oslo_config env var support

StackStorm · Nov 2, 2024 · c134099 · c134099
1 parent d9f5782
commit c134099
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 0 deletions.
diff --git a/st2actions/st2actions/notifier/config.py b/st2actions/st2actions/notifier/config.py
@@ -25,10 +25,13 @@
 
 
 def parse_args(args=None):
+    # Override oslo_config's 'OS_' env var prefix with 'ST2_'.
+    cfg.CONF._env_driver = common_config.St2EnvironmentConfigurationSource()
     cfg.CONF(
         args=args,
         version=VERSION_STRING,
         default_config_files=[DEFAULT_CONFIG_FILE_PATH],
+        use_env=True,  # Make our env var support explicit (default is True)
     )
 
 

diff --git a/st2actions/st2actions/scheduler/config.py b/st2actions/st2actions/scheduler/config.py
@@ -27,10 +27,13 @@
 
 
 def parse_args(args=None):
+    # Override oslo_config's 'OS_' env var prefix with 'ST2_'.
+    cfg.CONF._env_driver = common_config.St2EnvironmentConfigurationSource()
     cfg.CONF(
         args=args,
         version=sys_constants.VERSION_STRING,
         default_config_files=[DEFAULT_CONFIG_FILE_PATH],
+        use_env=True,  # Make our env var support explicit (default is True)
     )
 
 

diff --git a/st2actions/st2actions/workflows/config.py b/st2actions/st2actions/workflows/config.py
@@ -23,10 +23,13 @@
 
 
 def parse_args(args=None):
+    # Override oslo_config's 'OS_' env var prefix with 'ST2_'.
+    cfg.CONF._env_driver = common_config.St2EnvironmentConfigurationSource()
     cfg.CONF(
         args=args,
         version=sys_constants.VERSION_STRING,
         default_config_files=[DEFAULT_CONFIG_FILE_PATH],
+        use_env=True,  # Make our env var support explicit (default is True)
     )
 
 

diff --git a/st2api/st2api/config.py b/st2api/st2api/config.py
@@ -32,10 +32,13 @@
 
 
 def parse_args(args=None):
+    # Override oslo_config's 'OS_' env var prefix with 'ST2_'.
+    cfg.CONF._env_driver = common_config.St2EnvironmentConfigurationSource()
     cfg.CONF(
         args=args,
         version=VERSION_STRING,
         default_config_files=[DEFAULT_CONFIG_FILE_PATH],
+        use_env=True,  # Make our env var support explicit (default is True)
     )
 
 

diff --git a/st2auth/st2auth/config.py b/st2auth/st2auth/config.py
@@ -28,10 +28,13 @@
 
 
 def parse_args(args=None):
+    # Override oslo_config's 'OS_' env var prefix with 'ST2_'.
+    cfg.CONF._env_driver = st2cfg.St2EnvironmentConfigurationSource()
     cfg.CONF(
         args=args,
         version=VERSION_STRING,
         default_config_files=[DEFAULT_CONFIG_FILE_PATH],
+        use_env=True,  # Make our env var support explicit (default is True)
     )
 
 

diff --git a/st2reactor/st2reactor/garbage_collector/config.py b/st2reactor/st2reactor/garbage_collector/config.py
@@ -27,10 +27,13 @@
 
 
 def parse_args(args=None):
+    # Override oslo_config's 'OS_' env var prefix with 'ST2_'.
+    cfg.CONF._env_driver = common_config.St2EnvironmentConfigurationSource()
     cfg.CONF(
         args=args,
         version=VERSION_STRING,
         default_config_files=[DEFAULT_CONFIG_FILE_PATH],
+        use_env=True,  # Make our env var support explicit (default is True)
     )
 
 

diff --git a/st2reactor/st2reactor/rules/config.py b/st2reactor/st2reactor/rules/config.py
@@ -25,10 +25,13 @@
 
 
 def parse_args(args=None):
+    # Override oslo_config's 'OS_' env var prefix with 'ST2_'.
+    cfg.CONF._env_driver = common_config.St2EnvironmentConfigurationSource()
     cfg.CONF(
         args=args,
         version=VERSION_STRING,
         default_config_files=[DEFAULT_CONFIG_FILE_PATH],
+        use_env=True,  # Make our env var support explicit (default is True)
     )
 
 

diff --git a/st2reactor/st2reactor/sensor/config.py b/st2reactor/st2reactor/sensor/config.py
@@ -26,10 +26,13 @@
 
 
 def parse_args(args=None):
+    # Override oslo_config's 'OS_' env var prefix with 'ST2_'.
+    cfg.CONF._env_driver = st2cfg.St2EnvironmentConfigurationSource()
     cfg.CONF(
         args=args,
         version=VERSION_STRING,
         default_config_files=[DEFAULT_CONFIG_FILE_PATH],
+        use_env=True,  # Make our env var support explicit (default is True)
     )
 
 

diff --git a/st2reactor/st2reactor/timer/config.py b/st2reactor/st2reactor/timer/config.py
@@ -25,10 +25,13 @@
 
 
 def parse_args(args=None):
+    # Override oslo_config's 'OS_' env var prefix with 'ST2_'.
+    cfg.CONF._env_driver = common_config.St2EnvironmentConfigurationSource()
     cfg.CONF(
         args=args,
         version=VERSION_STRING,
         default_config_files=[DEFAULT_CONFIG_FILE_PATH],
+        use_env=True,  # Make our env var support explicit (default is True)
     )
 
 

diff --git a/st2stream/st2stream/config.py b/st2stream/st2stream/config.py
@@ -32,10 +32,13 @@
 
 
 def parse_args(args=None):
+    # Override oslo_config's 'OS_' env var prefix with 'ST2_'.
+    cfg.CONF._env_driver = common_config.St2EnvironmentConfigurationSource()
     cfg.CONF(
         args=args,
         version=VERSION_STRING,
         default_config_files=[DEFAULT_CONFIG_FILE_PATH],
+        use_env=True,  # Make our env var support explicit (default is True)
     )