diff options
| -rw-r--r-- | .zuul.yaml | 39 | ||||
| -rw-r--r-- | doc/requirements.txt | 2 | ||||
| -rw-r--r-- | doc/source/user/vendor-support.rst | 16 | ||||
| -rw-r--r-- | os_client_config/config.py | 10 | ||||
| -rw-r--r-- | os_client_config/vendors/limestonenetworks.json | 15 | ||||
| -rw-r--r-- | os_client_config/vendors/vexxhost.json | 1 | ||||
| -rw-r--r-- | releasenotes/notes/vendor-add-limestonenetworks-99b2ffab9fc23b08.yaml | 4 | ||||
| -rw-r--r-- | requirements.txt | 4 | ||||
| -rw-r--r-- | tox.ini | 2 |
9 files changed, 83 insertions, 10 deletions
@@ -1,6 +1,43 @@ +- job: + name: os-client-config-tox-py27-tips + parent: openstack-tox-py27 + description: | + Run tox python 27 unittests against master of important libs + vars: + tox_install_siblings: true + zuul_work_dir: src/git.openstack.org/openstack/os-client-config + required-projects: + - openstack/keystoneauth + - openstack/openstacksdk + - openstack/os-client-config + +- job: + name: os-client-config-tox-py35-tips + parent: openstack-tox-py35 + description: | + Run tox python 35 unittests against master of important libs + vars: + tox_install_siblings: true + zuul_work_dir: src/git.openstack.org/openstack/os-client-config + required-projects: + - openstack/keystoneauth + - openstack/openstacksdk + - openstack/os-client-config + +- project-template: + name: os-client-config-tox-tips + check: + jobs: + - os-client-config-tox-py27-tips + - os-client-config-tox-py35-tips + gate: + jobs: + - os-client-config-tox-py27-tips + - os-client-config-tox-py35-tips + - project: - name: openstack/os-client-config templates: + - os-client-config-tox-tips - shade-functional-tips - shade-tox-tips check: diff --git a/doc/requirements.txt b/doc/requirements.txt index 0ddd8c3..bd99db7 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,6 +2,6 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. docutils>=0.11 # OSI-Approved Open Source, Public Domain -sphinx!=1.6.6,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD openstackdocstheme>=1.18.1 # Apache-2.0 reno>=2.5.0 # Apache-2.0 diff --git a/doc/source/user/vendor-support.rst b/doc/source/user/vendor-support.rst index 161595f..2c7bed3 100644 --- a/doc/source/user/vendor-support.rst +++ b/doc/source/user/vendor-support.rst @@ -226,6 +226,22 @@ sjc01 San Jose, CA * Floating IPs are not supported +limestonenetworks +----------------- + +https://auth.cloud.lstn.net:5000/v3 + +============== ================== +Region Name Location +============== ================== +us-dfw-1 Dallas, TX +us-slc Salt Lake City, UT +============== ================== + +* Identity API Version is 3 +* Images must be in `raw` format +* IPv6 is provided to every server connected to the `Public Internet` network + ovh --- diff --git a/os_client_config/config.py b/os_client_config/config.py index ce4f045..f80e158 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -872,17 +872,16 @@ class OpenStackConfig(object): return config def _get_auth_loader(self, config): - # Re-use the admin_token plugin for the "None" plugin + # Use the 'none' plugin for variants of None specified, # since it does not look up endpoints or tokens but rather # does a passthrough. This is useful for things like Ironic # that have a keystoneless operational mode, but means we're # still dealing with a keystoneauth Session object, so all the # _other_ things (SSL arg handling, timeout) all work consistently if config['auth_type'] in (None, "None", ''): - config['auth_type'] = 'admin_token' - # Set to notused rather than None because validate_auth will - # strip the value if it's actually python None - config['auth']['token'] = 'notused' + # 'none' auth_plugin has token as 'notused' so validate_auth will + # not strip the value (which it does for actual python None) + config['auth_type'] = 'none' elif config['auth_type'] == 'token_endpoint': # Humans have been trained to use a thing called token_endpoint # That it does not exist in keystoneauth is irrelvant- it not @@ -1238,6 +1237,7 @@ class OpenStackConfig(object): with open(config_file, 'w') as fh: yaml.safe_dump(cur_config, fh, default_flow_style=False) + if __name__ == '__main__': config = OpenStackConfig().get_all_clouds() for cloud in config: diff --git a/os_client_config/vendors/limestonenetworks.json b/os_client_config/vendors/limestonenetworks.json new file mode 100644 index 0000000..659a95b --- /dev/null +++ b/os_client_config/vendors/limestonenetworks.json @@ -0,0 +1,15 @@ +{ + "name": "limestonenetworks", + "profile": { + "auth": { + "auth_url": "https://auth.cloud.lstn.net:5000/v3" + }, + "regions": [ + "us-dfw-1", + "us-slc" + ], + "identity_api_version": "3", + "image_format": "raw", + "volume_api_version": "3" + } + } diff --git a/os_client_config/vendors/vexxhost.json b/os_client_config/vendors/vexxhost.json index 2227fff..10e131d 100644 --- a/os_client_config/vendors/vexxhost.json +++ b/os_client_config/vendors/vexxhost.json @@ -9,6 +9,7 @@ ], "dns_api_version": "1", "identity_api_version": "3", + "image_format": "raw", "floating_ip_source": "None", "requires_floating_ip": false } diff --git a/releasenotes/notes/vendor-add-limestonenetworks-99b2ffab9fc23b08.yaml b/releasenotes/notes/vendor-add-limestonenetworks-99b2ffab9fc23b08.yaml new file mode 100644 index 0000000..d0e8332 --- /dev/null +++ b/releasenotes/notes/vendor-add-limestonenetworks-99b2ffab9fc23b08.yaml @@ -0,0 +1,4 @@ +--- +other: + - | + Add Limestone Networks vendor info for us-dfw-1 and us-slc regions diff --git a/requirements.txt b/requirements.txt index 482e158..b8f674c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -PyYAML>=3.10 # MIT +PyYAML>=3.12 # MIT appdirs>=1.3.0 # MIT License -keystoneauth1>=3.3.0 # Apache-2.0 +keystoneauth1>=3.4.0 # Apache-2.0 requestsexceptions>=1.2.0 # Apache-2.0 @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = py35,py27,pypy,pep8 +envlist = py35,py27,pep8 skipsdist = True [testenv] |