Enable hugepages for idempotency tests

At some point allocate_hugepages task started
to execute on a condition (that hugepages are set
for a node in question).
To cover checking allocate_hugepages task for
idempotency the tests have been updated to enable
this setting.

Also update idempotency task fixtures due to some new
tasks appeared in deployment flow of the corresponding
cluster configs.

Change-Id: Ic1354ab128362e40a4c46fc79830d43d2725d0ee
Closes-Bug: #1614919
This commit is contained in:
Dmitriy Kruglov 2016-08-19 11:11:00 +00:00
parent 78e594c093
commit 45487551ef
16 changed files with 99 additions and 6 deletions

View File

@ -549,6 +549,18 @@ class LCMTestBasic(TestBasic):
logger.info("Generated nodes settings fixture:\n{}".format(
yaml.safe_dump(nodes_s, default_flow_style=False)))
def enable_hugepages(self, node_ids):
"""Updates settings of the given nodes to enable hugepages
:param node_ids: list, node IDs
:return: None
"""
for node_id in node_ids:
settings = self.fuel_web.client.get_node_attributes(
node_id)
settings['hugepages']['nova']['value']['2048'] = 10
self.fuel_web.client.upload_node_attributes(settings, node_id)
@test(groups=['deploy_lcm_environment'])
class SetupLCMEnvironment(LCMTestBasic):
@ -598,6 +610,8 @@ class SetupLCMEnvironment(LCMTestBasic):
)
self.show_step(6)
slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)
self.enable_hugepages([node['id'] for node in slave_nodes])
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(7)
slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)
@ -657,6 +671,8 @@ class SetupLCMEnvironment(LCMTestBasic):
)
self.show_step(6)
slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)
self.enable_hugepages([node['id'] for node in slave_nodes])
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(7)
slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)
@ -721,6 +737,8 @@ class SetupLCMEnvironment(LCMTestBasic):
)
self.show_step(6)
slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)
self.enable_hugepages([node['id'] for node in slave_nodes])
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(7)
slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)
@ -786,6 +804,8 @@ class SetupLCMEnvironment(LCMTestBasic):
)
self.show_step(5)
slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)
self.enable_hugepages([node['id'] for node in slave_nodes])
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(6)
slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)
@ -844,6 +864,8 @@ class SetupLCMEnvironment(LCMTestBasic):
)
self.show_step(5)
slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)
self.enable_hugepages([node['id'] for node in slave_nodes])
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(6)
slave_nodes = self.fuel_web.client.list_cluster_nodes(cluster_id)

View File

@ -21,6 +21,8 @@ tasks:
- setup_repositories: null
- dns-client: null
- allocate_hugepages: null
- copy_changed_admin_user:
type: copy_files
- plugins_setup_repositories:
no_puppet_run: true
- ssl-keys-saving: null
@ -44,5 +46,7 @@ tasks:
- copy_haproxy_keys:
type: copy_files
- ntp-client: null
- pkg_upgrade:
no_puppet_run: true
- ssl-add-trust-chain: null
- reserved_ports: null

View File

@ -28,6 +28,8 @@ tasks:
- dns-client: null
- openstack-network-plugins-l2: null
- allocate_hugepages: null
- copy_changed_admin_user:
type: copy_files
- plugins_setup_repositories:
no_puppet_run: true
- ceph-compute:
@ -63,5 +65,7 @@ tasks:
- copy_haproxy_keys:
type: copy_files
- ntp-client: null
- pkg_upgrade:
no_puppet_run: true
- ssl-add-trust-chain: null
- reserved_ports: null

View File

@ -19,7 +19,8 @@ tasks:
- nova-db: null
- workloads_collector_add: null
- primary-openstack-network-plugins-l2: null
- radosgw-keystone: null
- radosgw-keystone:
no_puppet_run: true
- virtual_ips: null
- primary-dns-server: null
- openstack-haproxy-murano:
@ -59,6 +60,7 @@ tasks:
type: copy_files
- enable_rados:
no_puppet_run: true
- delete_old_admin_user: null
- ntp-check: null
- aodh-db:
no_puppet_run: true
@ -135,7 +137,8 @@ tasks:
- openstack-haproxy-stats: null
- ironic-api:
no_puppet_run: true
- primary-ceph-radosgw: null
- primary-ceph-radosgw:
no_puppet_run: true
- dns-client: null
- cluster-vrouter: null
- murano-rabbitmq:
@ -166,6 +169,8 @@ tasks:
type: shell
- enable_quorum:
type: shell
- copy_changed_admin_user:
type: copy_files
- openstack-haproxy-nova: null
- openstack-network-server-config: null
- primary-database:
@ -194,5 +199,7 @@ tasks:
- openstack-network-server-nova: null
- copy_haproxy_keys:
type: copy_files
- pkg_upgrade:
no_puppet_run: true
- openstack-network-networks: null
- ssl-add-trust-chain: null

View File

@ -28,6 +28,8 @@ tasks:
- dns-client: null
- openstack-network-plugins-l2: null
- allocate_hugepages: null
- copy_changed_admin_user:
type: copy_files
- plugins_setup_repositories:
no_puppet_run: true
- ceph-compute:
@ -63,5 +65,7 @@ tasks:
- copy_haproxy_keys:
type: copy_files
- ntp-client: null
- pkg_upgrade:
no_puppet_run: true
- ssl-add-trust-chain: null
- reserved_ports: null

View File

@ -19,7 +19,8 @@ tasks:
- nova-db: null
- workloads_collector_add: null
- primary-openstack-network-plugins-l2: null
- radosgw-keystone: null
- radosgw-keystone:
no_puppet_run: true
- virtual_ips: null
- primary-dns-server: null
- openstack-haproxy-murano:
@ -57,6 +58,7 @@ tasks:
type: copy_files
- enable_rados:
no_puppet_run: true
- delete_old_admin_user: null
- ntp-check: null
- aodh-db:
no_puppet_run: true
@ -128,7 +130,8 @@ tasks:
- primary-ceph-mon: null
- openstack-haproxy-stats: null
- ironic-api: null
- primary-ceph-radosgw: null
- primary-ceph-radosgw:
no_puppet_run: true
- dns-client: null
- cluster-vrouter: null
- murano-rabbitmq:
@ -159,6 +162,8 @@ tasks:
type: shell
- enable_quorum:
type: shell
- copy_changed_admin_user:
type: copy_files
- openstack-haproxy-nova: null
- openstack-network-server-config: null
- primary-database:
@ -187,5 +192,7 @@ tasks:
- openstack-network-server-nova: null
- copy_haproxy_keys:
type: copy_files
- pkg_upgrade:
no_puppet_run: true
- openstack-network-networks: null
- ssl-add-trust-chain: null

View File

@ -21,6 +21,8 @@ tasks:
type: copy_files
- setup_repositories: null
- allocate_hugepages: null
- copy_changed_admin_user:
type: copy_files
- plugins_setup_repositories:
no_puppet_run: true
- ironic-conductor: null
@ -40,4 +42,6 @@ tasks:
- hosts: null
- copy_haproxy_keys:
type: copy_files
- pkg_upgrade:
no_puppet_run: true
- reserved_ports: null

View File

@ -28,6 +28,8 @@ tasks:
- dns-client: null
- openstack-network-plugins-l2: null
- allocate_hugepages: null
- copy_changed_admin_user:
type: copy_files
- plugins_setup_repositories:
no_puppet_run: true
- ceph-compute:
@ -62,5 +64,7 @@ tasks:
- copy_haproxy_keys:
type: copy_files
- ntp-client: null
- pkg_upgrade:
no_puppet_run: true
- ssl-add-trust-chain: null
- reserved_ports: null

View File

@ -17,7 +17,8 @@ tasks:
- nova-db: null
- workloads_collector_add: null
- primary-openstack-network-plugins-l2: null
- radosgw-keystone: null
- radosgw-keystone:
no_puppet_run: true
- virtual_ips: null
- primary-dns-server: null
- openstack-haproxy-murano:
@ -57,6 +58,7 @@ tasks:
type: copy_files
- enable_rados:
no_puppet_run: true
- delete_old_admin_user: null
- ntp-check: null
- aodh-db: null
- disable_keystone_service_token:
@ -129,7 +131,8 @@ tasks:
- openstack-haproxy-stats: null
- ironic-api:
no_puppet_run: true
- primary-ceph-radosgw: null
- primary-ceph-radosgw:
no_puppet_run: true
- dns-client: null
- cluster-vrouter: null
- murano-rabbitmq:
@ -160,6 +163,8 @@ tasks:
type: shell
- enable_quorum:
type: shell
- copy_changed_admin_user:
type: copy_files
- openstack-haproxy-nova: null
- openstack-network-server-config: null
- primary-database:
@ -188,5 +193,7 @@ tasks:
- openstack-network-server-nova: null
- copy_haproxy_keys:
type: copy_files
- pkg_upgrade:
no_puppet_run: true
- openstack-network-networks: null
- ssl-add-trust-chain: null

View File

@ -21,6 +21,8 @@ tasks:
- setup_repositories: null
- dns-client: null
- allocate_hugepages: null
- copy_changed_admin_user:
type: copy_files
- plugins_setup_repositories:
no_puppet_run: true
- ssl-keys-saving: null
@ -41,5 +43,7 @@ tasks:
- copy_haproxy_keys:
type: copy_files
- ntp-client: null
- pkg_upgrade:
no_puppet_run: true
- ssl-add-trust-chain: null
- reserved_ports: null

View File

@ -20,6 +20,8 @@ tasks:
- setup_repositories: null
- dns-client: null
- allocate_hugepages: null
- copy_changed_admin_user:
type: copy_files
- plugins_setup_repositories:
no_puppet_run: true
- ssl-keys-saving: null
@ -42,5 +44,7 @@ tasks:
- copy_haproxy_keys:
type: copy_files
- ntp-client: null
- pkg_upgrade:
no_puppet_run: true
- ssl-add-trust-chain: null
- reserved_ports: null

View File

@ -28,6 +28,8 @@ tasks:
- dns-client: null
- openstack-network-plugins-l2: null
- allocate_hugepages: null
- copy_changed_admin_user:
type: copy_files
- plugins_setup_repositories:
no_puppet_run: true
- ceph-compute: null
@ -62,5 +64,7 @@ tasks:
- copy_haproxy_keys:
type: copy_files
- ntp-client: null
- pkg_upgrade:
no_puppet_run: true
- ssl-add-trust-chain: null
- reserved_ports: null

View File

@ -57,6 +57,7 @@ tasks:
- copy_keys:
type: copy_files
- enable_rados: null
- delete_old_admin_user: null
- ntp-check: null
- aodh-db:
no_puppet_run: true
@ -166,6 +167,8 @@ tasks:
type: shell
- enable_quorum:
type: shell
- copy_changed_admin_user:
type: copy_files
- openstack-haproxy-nova: null
- openstack-network-server-config: null
- primary-database:
@ -194,5 +197,7 @@ tasks:
- openstack-network-server-nova: null
- copy_haproxy_keys:
type: copy_files
- pkg_upgrade:
no_puppet_run: true
- openstack-network-networks: null
- ssl-add-trust-chain: null

View File

@ -28,6 +28,8 @@ tasks:
- dns-client: null
- openstack-network-plugins-l2: null
- allocate_hugepages: null
- copy_changed_admin_user:
type: copy_files
- plugins_setup_repositories:
no_puppet_run: true
- updatedb: null
@ -63,5 +65,7 @@ tasks:
- copy_haproxy_keys:
type: copy_files
- ntp-client: null
- pkg_upgrade:
no_puppet_run: true
- ssl-add-trust-chain: null
- reserved_ports: null

View File

@ -117,6 +117,8 @@ tasks:
no_puppet_run: true
- openstack-network-plugins-l2: null
- openstack-network-agents-dhcp: null
- copy_changed_admin_user:
type: copy_files
- openstack-haproxy-nova: null
- openstack-network-server-config: null
- openstack-haproxy-cinder: null
@ -131,4 +133,6 @@ tasks:
- openstack-network-server-nova: null
- copy_haproxy_keys:
type: copy_files
- pkg_upgrade:
no_puppet_run: true
- ssl-add-trust-chain: null

View File

@ -55,6 +55,7 @@ tasks:
- copy_keys:
type: copy_files
- enable_rados: null
- delete_old_admin_user: null
- ntp-check: null
- aodh-db: null
- disable_keystone_service_token:
@ -157,6 +158,8 @@ tasks:
type: shell
- enable_quorum:
type: shell
- copy_changed_admin_user:
type: copy_files
- openstack-haproxy-nova: null
- openstack-network-server-config: null
- primary-database:
@ -185,5 +188,7 @@ tasks:
- openstack-network-server-nova: null
- copy_haproxy_keys:
type: copy_files
- pkg_upgrade:
no_puppet_run: true
- openstack-network-networks: null
- ssl-add-trust-chain: null