[OpenStack-Infra] [kolla] kolla-cli master pointer change

Borne Mace borne.mace at oracle.com
Wed Mar 28 18:14:12 UTC 2018


Hi All,

I brought up my issue in #openstack-infra and it was suggested that I 
send an email to this list.

The kolla-cli repository was recently created, from existing sources.  
There was an issue with the source repo where the master branch was 
sorely out of date, but there is tagged source which is up to date.  My 
hope is that someone can force-push the tag as master so that the master 
branch can be fixed / updated.

I tried to solve this process through the normal merge process, but 
since I was not the only committer to that repository gerrit refused to 
post my review.  I will add the full output of that attempt at the end 
so folks can see what I'm talking about.  If there is some other process 
that is more appropriate for me to follow here let me know and I'm happy 
to go through it.

The latest / optimal code is tagged as o3l_4.0.1.

Thanks much for your help!

-- Borne Mace


bmace at borg ~/devel/kolla-cli $ git review -R
You are about to submit multiple commits. This is expected if you are
submitting a commit that is dependent on one or more in-review
commits. Otherwise you should consider squashing your changes into one
commit before submitting.

The outstanding commits are:

3cdd26e (HEAD -> master) Merge tag 'o3l_4.0.1'
7da1927 (tag: o3l_4.0.1) Updated version to 4.0.1
079cf5c Fix yaml issue with adding ellipsis after booleans
c1cfa88 Fix property setting when current value is None
1fc7122 Tweak kollacli help
da2e8b6 Fix kollacli dump output
3d47927 Support modification of non string properties
c8a5730 Updated unit tests to avoid remote calls
08f050a Supported service filtering added
725c80a Re-worked the way service association is handled
2e70c5c Added support for pull command
99afdbc Updated inventory version for 4.x release
f597625 chdir before ansible execution to avoid new ansible behavior
03db283 Hard bind cliff dependency and minor unicode fixes
2ee8db4 Add reconfigure CLI command
d44f712 Fix precheck command
69700b6 Updating the python api syntax
5281bdc Updated version from 3.0.1 to 4.0.0
e4f52da Revert "Added support for a new reconfigure command"
3c4828e Added support for a new reconfigure command
5dc9de9 Modified per host commands to use ansible --limit
f7166ed API support for the reconfigure action
3e5cc35 Added support for turning off locking with environment variable
bc42e6b WIP: Added initial support for stop containers
0c56e57 Fixed bug causing destroy on multiple hosts to fail
7cbb157 Pass through unlimited -v args to ansible playbook
a320450 Added support for ignoring certain ansible errors.
4c70581 Fixed rpm spec after removal of the custom cli destroy playbooks
499aa1e Removed no longer relevant cli destroy playbooks
9772b1a Added support for removal of docker images during destroy
55da569 allow empty passwords to be set
31363f8 Updated destroy to use upstream destroy playbook
bb16c06 support multiple parents of services in allinone file
3ad1c68 Allow empty groups and comments
28a9d93 Adjust preinstall entry to include a blank line.
8d87bea use cat command to add kolla_preinstall_version to properties file
ea4ee6d Added support for upgrade and deploy per service
d02b381 Update api docs
0a98fdb add new cli/api command to init passwords
c0d104a add kolla_preinstall_version property in rpm spec
38d3120 clear out all /usr/share/kolla/kollacli files on uninstall
3f029a7 add ability to cli/api to add/clear ssh keys in password file
8858b0f move oracle-specific precheck to kollacli rpm
b6b2018 add empty password check on deploy
894f8e7 remove docker-py requirement from kollacli
ed7b025 unit test updates for mitaka changes
e812696 use inventory_samples as name of all-in-one dir
f371acd add ansible.cfg to kollacli spec
b0f8494 in api, avoid adding keys if host is already setup
5524219 Changed initial inventory generation source path
6c5473d ensure dir for temp inventory is writable
011f885 Added deploy action needed for kolla update
510d5f7 Merge branch 'master' into o3l_3.next
a963d25 change plugin license back to gpl3
016e9cb Added pep-484 entry to inventory file.
694b2db Added initial mypy / pep-484 type hinting support.
75550c3 Properly display non-ascii chars in table output
76aa503 allow property set of empty string
0bb430d Better version spec for docker-py
17ef5a5 add api comment to api about locality of api objects
e06ce72 change 'kolla' to 'root' when asking for password in host setup
acda25f fix string pointer bug in last checkin
8f50a8c fix string pointer bug in last checkin
459a76d make ansible plugin message display more reliable
aa3b2fe update docs
5263b89 fix host & service associations in group object
fc53a26 properly handle repeated params in group/service get
05e0161 add timeout option to deploy
0d17761 show error details on 'One or more items failed'
f044f2b various upgrade fixes
c5833aa Use inventory_samples for location of all-in-one file
8dba45e use all-in-one file to seed initial inventory
246ab1c use private ansible.cfg file
5f4f828 add ability to enable plugin debug via /tmp file
ad7536d add version to api, misc fixes
5a6903a add warning on local deploy and avoid doc build errors on doc gen
984b190 Updated pipeling setting in line with bug 23282017
933fb64 update test to use kottos_home instead of kolla_home
4230879 move properties into zookeeper - phase 2
102ac39 move properties into zookeeper - phase 2
977af68 change order of chmod on create fifo
0b69fa5 update kollacli with latest kottos changes
81397af move callback plugin pipe down a level in /tmp
3fe4d52 add ability to set debug logging as an env variable
53dfd16 fix for fragmentation bug in callback plugin msg processing
10098e7 remove unneeded update of callback_plugins line in rpm spec
ea1cc5a Updates to rpm build spec for callback_plugins configuration
eccf5cc updates to rpm build spec of sequence of requirements for plugin 
and kollacli
b91ac84 update cli rpm spec to require ansible plugin
6f6b517 Updated the kpolla-ansible requirement to 3.0.0
5e29f90 Remove no longer needed packages (six, paramiko) in cli v4
53eb65c Updated the RPM to 3.0
464b903 update rpm build spec for kollacli v4
a84bc67 fix discrepency of ansible lock location
d0ad451 removal of blaze code from cli (for v4)
7b53814 fix to handle string checking in p2 & py3
7e68685 update docs
e7e362c Api doc change to remove groups/services from deploy
c43a1b4 Remove service / group deploy and modified host deploy to throw 
an error if a targeted host deploy is attempted against non-compute hosts.
d680bb3 Updated docs to reflect latest api change for changing multiple 
properties in a single call.
614295d fix another instance where ansible error does not surface to the 
job error message
f8b81d7 Fixed deploy lock message to remove pid / owner info no longer 
available using flock.
e539a62 fixed false positive bandit complaints about yaml load
03e162c Properties are now only loaded on list calls, making set / clear 
more performant.
161d50b update docs
c96c508 update build spec to remove etc and share, fix warnings
6338975 removed suprious unneeded debug log line
62ff3c5 Fixed issue when setting a property on multiple hosts / groups
7a1547a Added support for settings / clearing multiple properties in a 
single call.
89327d1 add kolla ansible plugin to cli build spec
b31c030 Added support for sync on ansible playbook operations. Writes 
cannot occur when ansible operations are happening.
2a9497f add job kill to api
7b14d4f configure logging for api
fed76d8 fix inventory bug in playbook
41eead3 Update api docs
9ef934e add api for log collecting
c60b33a Replaced flock with NFS safe locking mechanism
d3ecb14 cleanup of playbook runs
bbf65a0 better error messages in playbook failures
e3d0df6 improved logging of failed ansible playbooks
144a9f8 change group add/remove api to take list of groups
6f695e5 Updated api docs
aef4fe7 Add more doc for async deploy
435a733 Added property API
a7dfc5c add some unittests for group api
10f5f1e add some unittests for host api
40c32ee preserve inventory and vars during utests
289e281 Added code to check sub-service parent enablement to determine 
if a group needs hosts
5096708 add generic param checker for api
0eccaab add new unit test for client upgrade
88a13c7 Fix upgrade bug and sub-service parent/group issue
9ad9c13 create api for dump command
fd61b3d rebuild & update the docs
4b229c6 finish up group api
ee80b1b add get and get_all methods to group api
8d9e66a new password api, partial service api
1526794 Initial API Doc commit
8f84593 Added API calls for group add / remove with docs.
3eeb6ba Sphinx formatted docs for deploy mode set
eb82eb5 second pass thru the new host api
b883423 update host api & cli
5a1596f Added initial sphinx documentation support for the python api
f593325 Update host destroy and precheck api to take list of hosts
1cdd533 Merge branch 'o3l_2.next'
1e58e92 create apis for deploy, upgrade, host_destroy, host_precheck
67ef234 WIP - make playbook runs async
dfee416 update tox.ini to ignore apache license in callback
eca0695 WIP - add callback pipe logic to client side
a15db48 Better handling of unicode in log collector.
2ed4290 Changed way we handle global properties (from 
/etc/kolla/globals.yml to /usr/share/kolla/ansible/group_vars/__GLOBAL).
9298bd1 fixed bug in host related property listing when the list is empty
57c1acf Improved property output to include override data.
b655bc6 WIP - add named pipe code for message sending to client
e0c6079 WIP - add first draft of ansible callback
f9db085 Fix property ordering to go all / globals / groups / hosts. 
(lowest to highest priority)
98822a7 create unique deploy id for deployments
5cb91ee initial HostApi class and moved host add / remove to use the api
4e9d9da fix getting logs on ovm servers
7174233 added support for host remove all
b4fb6b3 fix minor help formatting issues
6703068 Added checking of groups with enabled services.  Each must have 
a minimum of one host associated to them.
e115ff6 fix issue when list property list --groups all
7f26c5e Added proper egg-info directory clean up to rpm update.
43173f5 disable retry_files_enabled in ansible.cfg
1447e67 disable retry_files_enabled in ansible.cfg
ef0d46f fix for property set side effect issue
a966412 Fixed property call that would match the wrong / extra lines
2d3899b fix docker ps issue in new destroy playbooks
cad25ae add new --predeploy option to host check
e0a4660 Improve host setup error reporting
069af18 Support host check all in cli
bf9aaea comment out 3.x WIP code
af385dd new ansible playbook + api code WIP
b8c5434 fix getting logs on ovm servers
4dbf1c3 added host remove all test
2f586ac added support for host remove all
72c3983 fix minor help formatting issues
083e57d Added checking of groups with enabled services.  Each must have 
a minimum of one host associated to them.
31d0402 fix issue when list property list --groups all
6cc807a Added proper egg-info directory clean up to rpm update.
f4de282 disable retry_files_enabled in ansible.cfg
b50b602 disable retry_files_enabled in ansible.cfg
4cdd43f fix for property set side effect issue
3b06fbd Merge branch 'o3l_2.next' of 
ssh://ca-git.us.oracle.com/openstack-kollacli into o3l_2.next
2a003dd fix docker ps issue in new destroy playbooks
e2a4b88 Fixed property call that would match the wrong / extra lines
301c5d9 add new --predeploy option to host check
ea7f091 Improve host setup error reporting
45b195f Support host check all in cli
f2b7225 Merge branch 'o3l_2.next'
e658a84 Fixed cli version to match rpm version.
cae8cb3 Display errors if host destroy fails
3b0fd1a update copyrights to 2016
92d9037 update log_collector tool for 2.1.1
5ac3e29 specifically disallow pexpect version 3.3
e903e75 Added clean up of /var/lib/kolla to the includedata cleanup.
497988e Added support to execute upgrade from cli.
965f140 fix up inventory path when loading a v1 inventory file
192769d put ceilometer in groups on upgrade
505fc81 fix a few ceilometer container names
d344809 add kollacli support for ceilometer
86ca539 Added calls into openstack-kolla precheck playbook during check 
command execution.
1dbc58d Added password confirmation to the password set command.
c8122d1 fix argparse when groups and hosts not specified
4b2ceb8 some refactoring for new host/groups properties
84e59f8 add unit tests for new host/groups properties
2e44000 Fixed permission on new host_vars dir
72c2bc7 simplify safe_decode and remove unneeded safe_encode
e444d95 remove oslo utils dependency from rpm spec
ceff841 remove oslo utils dependency
fa4b2fb Added support for group / host property editing
bdeb9cd Display errors if host destroy fails
9f37bb7 update copyrights to 2016
c679272 update log_collector tool for 2.1.1
e698e1c specifically disallow pexpect version 3.3
29ecad0 Merge branch 'o3l_2.next' of 
ssh://ca-git.us.oracle.com/openstack-kollacli into o3l_2.next
3338478 Merge branch 'o3l_2.next' of 
ssh://ca-git.us.oracle.com/openstack-kollacli into o3l_2.next
df43a51 fix up inventory path when loading a v1 inventory file
0ef1f25 Added clean up of /var/lib/kolla to the includedata cleanup.
04e47b6 Added support to execute upgrade from cli.
223c1e2 put ceilometer in groups on upgrade
70bc61c fix a few ceilometer container names
3f6cd72 add kollacli support for ceilometer
98c98d1 Added calls into openstack-kolla precheck playbook during check 
command execution.
f006136 Added password confirmation to the password set command.
a8c36b0 fix argparse when groups and hosts not specified
7b1a88a some refactoring for new host/groups properties
b0f1a2b add unit tests for new host/groups properties
dfac32a Merge branch 'o3l_2.next' of 
ssh://ca-git.us.oracle.com/openstack-kollacli into o3l_2.next
1be74db simplify safe_decode and remove unneeded safe_encode
efd6b47 Fixed permission on new host_vars dir
15ec75e remove oslo utils dependency from rpm spec
8d28135 remove oslo utils dependency
e106853 Added support for group / host property editing
654fd18 Merge branch 'o3l_2.next' of 
git://ca-git.us.oracle.com/openstack-kollacli
5995838 Changed default property values shown and added --all and --long 
flags.
5ff4aaa Jira-Issue:OPENSTACK-545
e2b2972 Jira-Issue:OPENSTACK-547
6225da7 Jira-Issue:OPENSTACK-545
c466e2b Forward port of data preservation for host destroy
8f6dd90 host destroy will not not destroy data containers by default.  
--includedata option added to destroy to remove all containers.
72db18d move dump logic out of cli

Do you really want to submit the above commits?
Type 'yes' to confirm, other to cancel: yes
remote: Processing changes: refs: 1, done
remote:
remote: ERROR:  In commit 72db18d96781c41a617ca2a3332dc02cdeb37f97
remote: ERROR:  committer email address steve.noyes at oracle.com
remote: ERROR:  does not match your user account.
remote: ERROR:
remote: ERROR:  The following addresses are currently registered:
remote: ERROR:    borne.mace at gmail.com
remote: ERROR:    borne.mace at oracle.com
remote: ERROR:
remote: ERROR:  To register an email address, please visit:
remote: ERROR: https://review.openstack.org/#/settings/contact
remote:
remote:
To ssh://bmace@review.openstack.org:29418/openstack/kolla-cli
  ! [remote rejected] HEAD -> refs/publish/master/bug/27219113 (invalid 
committer)
error: failed to push some refs to 
'ssh://bmace@review.openstack.org:29418/openstack/kolla-cli'




More information about the OpenStack-Infra mailing list