Skip to content

CLOUDSTACK-10052: Simplify dynamic roles enable checking [upgrade-bug]#2241

Merged
yadvr merged 1 commit into
apache:4.9from
shapeblue:roles-config-fix
Aug 22, 2017
Merged

CLOUDSTACK-10052: Simplify dynamic roles enable checking [upgrade-bug]#2241
yadvr merged 1 commit into
apache:4.9from
shapeblue:roles-config-fix

Conversation

@yadvr
Copy link
Copy Markdown
Member

@yadvr yadvr commented Aug 21, 2017

This fixes issue of enabling dynamic roles based on the global setting
only. This also fixes application of the default role/permissions mapping
on upgrade from 4.8 and previous versions to 4.9+.

Previously, it would make additional check to ensure commands.properties
is not in the classpath however this creates confusion for admins who
may skip/skim through the rn/docs and assume that mere changing the
global settings was not enough.

Pinging for review @PaulAngus @nvazquez @borisstoyanov @wido @pdion891 and others

@blueorangutan package

@yadvr
CLOUDSTACK-10052: Simplify dynamic roles enable checking
ab83020 
This fixes issue of enabling dynamic roles based on the global setting
only. This also fixes application of the default role/permissions mapping
on upgrade from 4.8 and previous versions to 4.9+.

Previously, it would make additional check to ensure commands.properties
is not in the classpath however this creates confusion for admins who
may skip/skim through the rn/docs and assume that mere changing the
global settings was not enough.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 21, 2017

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@yadvr yadvr changed the title CLOUDSTACK-10052: Simplify dynamic roles enable checking CLOUDSTACK-10052: Simplify dynamic roles enable checking [upgrade-bug] Aug 21, 2017
@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 21, 2017

Packaging result: ✖centos6 ✔centos7 ✖debian. JID-993

@yadvr
Copy link
Copy Markdown
Member Author

yadvr commented Aug 21, 2017

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 21, 2017

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 21, 2017

Packaging result: ✖centos6 ✔centos7 ✔debian. JID-994

@yadvr
Copy link
Copy Markdown
Member Author

yadvr commented Aug 21, 2017

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 21, 2017

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 21, 2017

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-996

@yadvr
Copy link
Copy Markdown
Member Author

yadvr commented Aug 21, 2017

@blueorangutan test

@yadvr yadvr closed this Aug 21, 2017
@yadvr yadvr reopened this Aug 21, 2017
@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 21, 2017

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 21, 2017

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-997

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 21, 2017

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-998

@yadvr
Copy link
Copy Markdown
Member Author

yadvr commented Aug 21, 2017

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 21, 2017

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 22, 2017

Trillian test result (tid-1405)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 45257 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2241-t1405-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
Intermitten failure detected: /marvin/tests/smoke/test_internal_lb.py
Intermitten failure detected: /marvin/tests/smoke/test_iso.py
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermitten failure detected: /marvin/tests/smoke/test_snapshots.py
Intermitten failure detected: /marvin/tests/smoke/test_templates.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Test completed. 50 look OK, 7 have error(s)

Test Result Time (s) Test File
test_01_vpc_remote_access_vpn Failure 55.60 test_vpc_vpn.py
test_04_rvpc_privategw_static_routes Failure 429.28 test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup Failure 1083.72 test_privategw_acl.py
test_01_create_template Error 50.34 test_templates.py
ContextSuite context=TestSnapshotRootDisk>:setup Error 0.00 test_snapshots.py
ContextSuite context=TestRedundantIsolateNetworks>:setup Error 1753.96 test_routers_network_ops.py
ContextSuite context=TestInternalLb>:setup Error 0.00 test_internal_lb.py
ContextSuite context=TestDeployVirtioSCSIVM>:teardown Error 45.59 test_deploy_virtio_scsi_vm.py
test_change_service_offering_for_vm_with_snapshots Skipped 0.00 test_vm_snapshots.py
test_09_copy_delete_template Skipped 0.01 test_templates.py
test_06_copy_template Skipped 0.00 test_templates.py
test_static_role_account_acls Skipped 0.01 test_staticroles.py
test_11_ss_nfs_version_on_ssvm Skipped 0.01 test_ssvm.py
test_01_scale_vm Skipped 0.00 test_scale_vm.py
test_01_primary_storage_iscsi Skipped 0.02 test_primary_storage.py
test_vm_nic_adapter_vmxnet3 Skipped 0.00 test_nic_adapter_type.py
test_nested_virtualization_vmware Skipped 0.00 test_nested_virtualization.py
test_06_copy_iso Skipped 0.00 test_iso.py
test_deploy_vgpu_enabled_vm Skipped 0.02 test_deploy_vgpu_enabled_vm.py
test_3d_gpu_support Skipped 0.02 test_deploy_vgpu_enabled_vm.py

@yadvr
Copy link
Copy Markdown
Member Author

yadvr commented Aug 22, 2017

LGTM, the test failures are intermittent failures, unrelated to the changes.

DaanHoogland
DaanHoogland approved these changes Aug 22, 2017
View reviewed changes
Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

simpler indeed, LGTM

borisstoyanov
borisstoyanov approved these changes Aug 22, 2017
View reviewed changes
Copy link
Copy Markdown
Contributor

@borisstoyanov borisstoyanov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, it does look much simpler, related tests are also passing.

@yadvr yadvr merged commit 310195c into apache:4.9 Aug 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@DaanHoogland DaanHoogland DaanHoogland approved these changes

@borisstoyanov borisstoyanov borisstoyanov approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@yadvr @blueorangutan @DaanHoogland @borisstoyanov