Merge "Update the method feature groups are enabled on deployed Master node"
This commit is contained in:
commit
381e3848da
@ -353,19 +353,10 @@ def get_package_versions_from_node(remote, name, os_type):
|
|||||||
|
|
||||||
|
|
||||||
@logwrap
|
@logwrap
|
||||||
def check_enable_experimental_mode(remote, path):
|
def enable_feature_group(env, group):
|
||||||
cmd = "sed '/feature_groups:" \
|
fuel_settings = env.admin_actions.get_fuel_settings()
|
||||||
"/a \ \ \ \ - experimental' -i {0}".format(path)
|
fuel_settings["FEATURE_GROUPS"].append(group)
|
||||||
result = remote.execute(cmd)
|
env.admin_actions.save_fuel_settings(fuel_settings)
|
||||||
assert_equal(0, result['exit_code'], result['stderr'])
|
|
||||||
|
|
||||||
|
|
||||||
@logwrap
|
|
||||||
def enable_advanced_mode(remote, path):
|
|
||||||
cmd = "sed '/feature_groups:" \
|
|
||||||
"/a \ \ \ \ - advanced' -i {0}".format(path)
|
|
||||||
result = remote.execute(cmd)
|
|
||||||
assert_equal(0, result['exit_code'], result['stderr'])
|
|
||||||
|
|
||||||
|
|
||||||
@logwrap
|
@logwrap
|
||||||
|
@ -51,9 +51,8 @@ class TestVirtRole(TestBasic):
|
|||||||
|
|
||||||
self.env.revert_snapshot("ready_with_1_slaves")
|
self.env.revert_snapshot("ready_with_1_slaves")
|
||||||
|
|
||||||
with self.env.d_env.get_admin_remote() as remote:
|
checkers.enable_feature_group(self.env, 'advanced')
|
||||||
checkers.enable_advanced_mode(remote, '/etc/fuel/version.yaml')
|
self.env.docker_actions.restart_container("nailgun")
|
||||||
checkers.restart_nailgun(remote)
|
|
||||||
|
|
||||||
cluster_id = self.fuel_web.create_cluster(
|
cluster_id = self.fuel_web.create_cluster(
|
||||||
name=self.__class__.__name__,
|
name=self.__class__.__name__,
|
||||||
@ -111,9 +110,8 @@ class TestVirtRole(TestBasic):
|
|||||||
|
|
||||||
self.env.revert_snapshot("ready_with_1_slaves")
|
self.env.revert_snapshot("ready_with_1_slaves")
|
||||||
|
|
||||||
with self.env.d_env.get_admin_remote() as remote:
|
checkers.enable_feature_group(self.env, 'advanced')
|
||||||
checkers.enable_advanced_mode(remote, '/etc/fuel/version.yaml')
|
self.env.docker_actions.restart_container("nailgun")
|
||||||
checkers.restart_nailgun(remote)
|
|
||||||
|
|
||||||
cluster_id = self.fuel_web.create_cluster(
|
cluster_id = self.fuel_web.create_cluster(
|
||||||
name=self.__class__.__name__,
|
name=self.__class__.__name__,
|
||||||
@ -178,9 +176,8 @@ class TestVirtRole(TestBasic):
|
|||||||
|
|
||||||
self.env.revert_snapshot("ready_with_3_slaves")
|
self.env.revert_snapshot("ready_with_3_slaves")
|
||||||
|
|
||||||
with self.env.d_env.get_admin_remote() as remote:
|
checkers.enable_feature_group(self.env, 'advanced')
|
||||||
checkers.enable_advanced_mode(remote, '/etc/fuel/version.yaml')
|
self.env.docker_actions.restart_container("nailgun")
|
||||||
checkers.restart_nailgun(remote)
|
|
||||||
|
|
||||||
cluster_id = self.fuel_web.create_cluster(
|
cluster_id = self.fuel_web.create_cluster(
|
||||||
name=self.__class__.__name__,
|
name=self.__class__.__name__,
|
||||||
|
@ -53,13 +53,8 @@ class HAOneControllerZabbix(TestBasic):
|
|||||||
"""
|
"""
|
||||||
self.env.revert_snapshot("ready_with_3_slaves")
|
self.env.revert_snapshot("ready_with_3_slaves")
|
||||||
|
|
||||||
with self.env.d_env.get_admin_remote() as admin_remote:
|
checkers.enable_feature_group(self.env, 'experimental')
|
||||||
# Turn on experimental mode
|
self.env.docker_actions.restart_container("nailgun")
|
||||||
checkers.check_enable_experimental_mode(
|
|
||||||
admin_remote, '/etc/fuel/version.yaml')
|
|
||||||
|
|
||||||
# restart nailgun
|
|
||||||
checkers.restart_nailgun(admin_remote)
|
|
||||||
|
|
||||||
# check if zabbix role appears
|
# check if zabbix role appears
|
||||||
self.fuel_web.assert_release_role_present(
|
self.fuel_web.assert_release_role_present(
|
||||||
|
Loading…
Reference in New Issue
Block a user