Remove non-working dynamic build of AIO scenario table
this disturbs still the translation job, so it's better to remove the table, the content is already explained in the text see: http://logs.openstack.org/periodic/git.openstack.org/openstack/openstack-ansible/master/propose-translation-update/d81e86d/job-output.txt.gz#_2018-09-16_06_23_07_166358 Change-Id: I129ebbeb40bc5d32ba01701b115437a1f0e9e625
This commit is contained in:
Frank Kloeker
parent
f1ccd0f3b2
commit
9553e89e62
8
.gitignore
vendored
8
.gitignore
vendored
@ -71,13 +71,9 @@ playbooks/root-include-playbook.yml
|
|||||||
playbooks/include-playbook.yml*
|
playbooks/include-playbook.yml*
|
||||||
playbooks/logs
|
playbooks/logs
|
||||||
|
|
||||||
# This file doc/source/user/aio/scenario-table-gen.html
|
# ignore zanata/sphinx cache on translation job
|
||||||
# is generated by doc/source/scenario_table_gen.py
|
|
||||||
# So we should ignore any contributor changes to it.
|
|
||||||
doc/source/user/aio/_assets
|
|
||||||
|
|
||||||
# ignore zanata cache on translation job
|
|
||||||
.zanata-cache/
|
.zanata-cache/
|
||||||
|
doc/source/.doctrees/
|
||||||
|
|
||||||
# ignore fetched upper-contraints file while translation job
|
# ignore fetched upper-contraints file while translation job
|
||||||
upper-constraints.txt
|
upper-constraints.txt
|
||||||
|
|||||||
@ -94,16 +94,6 @@ extlinks = {'deploy_guide': (deploy_guide_prefix, ''),
|
|||||||
'dev_docs': (dev_docs_prefix, '')
|
'dev_docs': (dev_docs_prefix, '')
|
||||||
}
|
}
|
||||||
|
|
||||||
# Generate dynamic table file.
|
|
||||||
SCENARIO_TABLE = 'user/aio/_assets/scenario-table-gen.html'
|
|
||||||
TABLE_FILE = os.path.join(CONF_PATH, SCENARIO_TABLE)
|
|
||||||
stg = imp.load_source(
|
|
||||||
'scenario_table_gen',
|
|
||||||
os.path.join(CONF_PATH, 'scenario_table_gen.py')
|
|
||||||
)
|
|
||||||
with open(TABLE_FILE, 'w') as f:
|
|
||||||
f.write(stg.main())
|
|
||||||
|
|
||||||
# If extensions (or modules to document with autodoc) are in another directory,
|
# If extensions (or modules to document with autodoc) are in another directory,
|
||||||
# add these directories to sys.path here. If the directory is relative to the
|
# add these directories to sys.path here. If the directory is relative to the
|
||||||
# documentation root, use os.path.abspath to make it absolute, like shown here.
|
# documentation root, use os.path.abspath to make it absolute, like shown here.
|
||||||
|
|||||||
@ -1,69 +0,0 @@
|
|||||||
#!/usr/bin/env python
|
|
||||||
# Copyright 2017, Rackspace US, Inc.
|
|
||||||
#
|
|
||||||
# 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 os
|
|
||||||
|
|
||||||
import yaml
|
|
||||||
|
|
||||||
|
|
||||||
SCRIPT_PATH = os.path.dirname(os.path.realpath(__file__))
|
|
||||||
SCENARIO_FILE = '../../tests/vars/bootstrap-aio-vars.yml'
|
|
||||||
HTML_TABLE = """<html><table border="1">"""
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
scenario_file = os.path.join(SCRIPT_PATH, SCENARIO_FILE)
|
|
||||||
with open(scenario_file) as f:
|
|
||||||
_meta_data = yaml.safe_load(f.read())
|
|
||||||
|
|
||||||
scenario_meta_data = _meta_data['confd_overrides']
|
|
||||||
scenarios = list(sorted(scenario_meta_data.keys()))
|
|
||||||
scenarios.insert(0, '')
|
|
||||||
HTML_TABLE = '<table border="1">'
|
|
||||||
HTML_TABLE += '<thead valign="bottom"><tr>'
|
|
||||||
for s in scenarios:
|
|
||||||
HTML_TABLE += '<th style="padding-left:5px;padding-right:5px;" class="head">{}</th>'.format(s)
|
|
||||||
HTML_TABLE += '</tr></thead><tbody valign="top">'
|
|
||||||
|
|
||||||
config_items = set()
|
|
||||||
for items in scenario_meta_data.values():
|
|
||||||
for item in items:
|
|
||||||
config_items.add(item['name'].split('.')[0])
|
|
||||||
config_items = list(sorted(config_items))
|
|
||||||
|
|
||||||
for item in config_items:
|
|
||||||
HTML_TABLE += '<tr>'
|
|
||||||
HTML_TABLE += '<td align="left">{}</td>'.format(item.lower())
|
|
||||||
for scenario in scenarios:
|
|
||||||
try:
|
|
||||||
scenario_meta = scenario_meta_data[scenario]
|
|
||||||
except KeyError:
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
for _items in scenario_meta:
|
|
||||||
if item == _items['name'].split('.')[0]:
|
|
||||||
HTML_TABLE += '<td align="center">X</td>'
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
HTML_TABLE += '<td> </td>'
|
|
||||||
HTML_TABLE += '</tr>'
|
|
||||||
HTML_TABLE += '</tbody>'
|
|
||||||
HTML_TABLE += '</table>'
|
|
||||||
|
|
||||||
return HTML_TABLE
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
print(main())
|
|
||||||
@ -1 +0,0 @@
|
|||||||
<table border="1"><thead valign="bottom"><tr><th style="padding-left:5px;padding-right:5px;" class="head"></th><th style="padding-left:5px;padding-right:5px;" class="head">aio_basekit</th><th style="padding-left:5px;padding-right:5px;" class="head">aio_lxc</th><th style="padding-left:5px;padding-right:5px;" class="head">aio_metal</th><th style="padding-left:5px;padding-right:5px;" class="head">aio_nspawn</th><th style="padding-left:5px;padding-right:5px;" class="head">ceph</th><th style="padding-left:5px;padding-right:5px;" class="head">congress</th><th style="padding-left:5px;padding-right:5px;" class="head">octavia</th><th style="padding-left:5px;padding-right:5px;" class="head">tacker</th><th style="padding-left:5px;padding-right:5px;" class="head">translations</th></tr></thead><tbody valign="top"><tr><td align="left">ceph</td><td> </td><td> </td><td> </td><td> </td><td align="center">X</td><td> </td><td> </td><td> </td><td> </td></tr><tr><td align="left">cinder</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td> </td><td> </td><td> </td><td align="center">X</td></tr><tr><td align="left">congress</td><td> </td><td> </td><td> </td><td> </td><td> </td><td align="center">X</td><td> </td><td> </td><td> </td></tr><tr><td align="left">designate</td><td> </td><td align="center">X</td><td> </td><td align="center">X</td><td> </td><td> </td><td> </td><td> </td><td align="center">X</td></tr><tr><td align="left">glance</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td> </td><td align="center">X</td><td> </td><td align="center">X</td></tr><tr><td align="left">haproxy</td><td align="center">X</td><td align="center">X</td><td> </td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td></tr><tr><td align="left">heat</td><td> </td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td> </td><td> </td><td> </td><td align="center">X</td><td align="center">X</td></tr><tr><td align="left">horizon</td><td> </td><td align="center">X</td><td> </td><td align="center">X</td><td> </td><td> </td><td> </td><td> </td><td align="center">X</td></tr><tr><td align="left">keystone</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td></tr><tr><td align="left">magnum</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td><td align="center">X</td></tr><tr><td align="left">neutron</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td> </td><td align="center">X</td></tr><tr><td align="left">nova</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td> </td><td align="center">X</td></tr><tr><td align="left">octavia</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td><td align="center">X</td><td> </td><td align="center">X</td></tr><tr><td align="left">sahara</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td><td align="center">X</td></tr><tr><td align="left">swift</td><td> </td><td align="center">X</td><td align="center">X</td><td align="center">X</td><td> </td><td> </td><td> </td><td> </td><td align="center">X</td></tr><tr><td align="left">tacker</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td><td align="center">X</td><td> </td></tr><tr><td align="left">trove</td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td><td> </td><td align="center">X</td></tr></tbody></table>
|
|
||||||
@ -218,10 +218,6 @@ execute the following:
|
|||||||
|
|
||||||
**Tested Scenarios**
|
**Tested Scenarios**
|
||||||
|
|
||||||
.. raw:: html
|
|
||||||
:file: _assets/scenario-table-gen.html
|
|
||||||
|
|
||||||
|
|
||||||
To add OpenStack Services over and above the `bootstrap-aio default services`_
|
To add OpenStack Services over and above the `bootstrap-aio default services`_
|
||||||
for the applicable scenario, copy the ``conf.d`` files with the ``.aio`` file
|
for the applicable scenario, copy the ``conf.d`` files with the ``.aio`` file
|
||||||
extension into ``/etc/openstack_deploy`` and rename then to ``.yml`` files.
|
extension into ``/etc/openstack_deploy`` and rename then to ``.yml`` files.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user