瀏覽代碼

Revert "Add the process environment to zuul.conf parser"

In prod for OpenDev we're seeing things like this:

http://paste.openstack.org/show/785704/

which lead us to believe this is somehow connected.

This reverts commit f2229705f3.

Change-Id: I0b73b71f72483e6c6e511411c3c59729761cec9b
tags/3.12.0
Monty Taylor 1 月之前
父節點
當前提交
1986d263c8
共有 5 個檔案被更改,包括 2 行新增44 行删除
  1. +0
    -5
      doc/source/admin/components.rst
  2. +0
    -4
      doc/source/admin/examples/docker-compose.yaml
  3. +1
    -1
      doc/source/admin/examples/etc_zuul/zuul.conf
  4. +0
    -33
      tests/unit/test_cmd.py
  5. +1
    -1
      zuul/cmd/__init__.py

+ 0
- 5
doc/source/admin/components.rst 查看文件

@@ -75,11 +75,6 @@ location may be supplied on the command line) which uses an INI file
syntax. Each component may have its own configuration file, though
you may find it simpler to use the same file for all components.

Zuul will interpolate environment variables given in the config file
escaped as python string expansion, so ``foo=%(HOME)s`` will set the
value of ``foo`` to the same value as the environment variable named
``HOME``.

An example ``zuul.conf``:

.. code-block:: ini

+ 0
- 4
doc/source/admin/examples/docker-compose.yaml 查看文件

@@ -46,7 +46,6 @@ services:
- http_proxy
- https_proxy
- no_proxy=${no_proxy},gerrit
- ZUUL_MYSQL_PASSWORD=secret
command: "sh -c '/var/playbooks/wait-to-start.sh && zuul-scheduler -d'"
# FIXME: The scheduler has no ansible anymore so use the executor image.
# This needs to be changes such that ansible is not required for startup.
@@ -63,8 +62,6 @@ services:
ports:
- "9000:9000"
image: zuul/zuul-web
environment:
ZUUL_MYSQL_PASSWORD: secret
volumes:
- "./etc_zuul/:/etc/zuul/:z"
- "./playbooks/:/var/playbooks/:z"
@@ -74,7 +71,6 @@ services:
- http_proxy
- https_proxy
- no_proxy=${no_proxy},gerrit,scheduler
- ZUUL_MYSQL_PASSWORD=secret
command: "zuul-executor -d"
depends_on:
- scheduler

+ 1
- 1
doc/source/admin/examples/etc_zuul/zuul.conf 查看文件

@@ -28,7 +28,7 @@ baseurl=https://opendev.org
[connection "mysql"]
name=mysql
driver=sql
dburi=mysql+pymysql://zuul:%(ZUUL_MYSQL_PASSWORD)s@mysql/zuul
dburi=mysql+pymysql://zuul:secret@mysql/zuul

[web]
listen_address=0.0.0.0

+ 0
- 33
tests/unit/test_cmd.py 查看文件

@@ -1,33 +0,0 @@
# Copyright 2013 Hewlett-Packard Development Company, L.P.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

import fixtures
import tempfile
import testtools

import zuul.cmd


class TestCmd(testtools.TestCase):
def test_read_config_with_environment(self):
"Test that readConfig interpolates environment vars"

with tempfile.NamedTemporaryFile() as test_config:
test_config.write(b'[DEFAULT]\nfoo=%(ENV_TEST)s\n')
test_config.flush()
with fixtures.EnvironmentVariable('ENV_TEST', 'baz'):
app = zuul.cmd.ZuulApp()
app.parseArguments(['-c', test_config.name])
app.readConfig()
self.assertEquals('baz', app.config.get('DEFAULT', 'foo'))

+ 1
- 1
zuul/cmd/__init__.py 查看文件

@@ -123,7 +123,7 @@ class ZuulApp(object):
return parser

def readConfig(self):
self.config = configparser.ConfigParser(os.environ)
self.config = configparser.ConfigParser()
if self.args.config:
locations = [self.args.config]
else:

Loading…
取消
儲存