Configuration templates updated

We need to update configuration templates with services definition and
appropriate "notify" parameters since new OpenStack configuration format
has been introduced.

Change-Id: Id195ee1bc9ecd4443ad3eae6e3bc5fae65b232e3
Closes-Bug: 1644656

fuelweb_test/config_templates/neutron.yaml

@@ -2,9 +2,15 @@
 neutron_plugin_ml2:
   ml2_type_vlan/network_vlan_ranges:
     value: "physnet2:1000:1001,physnet1"
+    notify: "Service[neutron-server]"
 neutron_config:
   DEFAULT/verbose:
     ensure: "absent"
+    notify: "Service[neutron-server]"
   DEFAULT/debug:
     value: "True"
+    notify: "Service[neutron-server]"
+service:
+  neutron-server:
+    ensure: running
 

fuelweb_test/config_templates/new_fields_compute.yaml

@@ -2,3 +2,7 @@
 nova_config:
   fuel_qa/service_reconfiguration_8:
     value: "InProgress"
+    notify: "Service[nova-compute]"
+service:
+  nova-compute:
+    ensure: running

fuelweb_test/config_templates/new_fields_controller.yaml

@@ -2,24 +2,52 @@
 neutron_config:
   fuel_qa/service_reconfiguration_1:
     value: "InProgress"
+    notify: "Service[neutron-server]"
 neutron_plugin_ml2:
   fuel_qa/service_reconfiguration_2:
     value: "InProgress"
+    notify: "Service[neutron-server]"
 neutron_dhcp_agent_config:
   fuel_qa/service_reconfiguration_4:
     value: "InProgress"
+    notify: "Service[neutron-server]"
 neutron_l3_agent_config:
   fuel_qa/service_reconfiguration_5:
     value: "InProgress"
+    notify: "Service[neutron-server]"
 neutron_metadata_agent_config:
   fuel_qa/service_reconfiguration_6:
     value: "InProgress"
+    notify: "Service[neutron-server]"
 neutron_api_config:
   fuel_qa/service_reconfiguration_7:
     value: "InProgress"
+    notify: "Service[neutron-server]"
 keystone_config:
   fuel_qa/service_reconfiguration_8:
     value: "InProgress"
 nova_config:
   fuel_qa/service_reconfiguration_9:
     value: "InProgress"
+    notify:
+    - "Service[nova-scheduler]"
+    - "Service[nova-novncproxy]"
+    - "Service[nova-conductor]"
+    - "Service[nova-api]"
+    - "Service[nova-consoleauth]"
+    - "Service[nova-cert]"
+service:
+  neutron-server:
+    ensure: running
+  nova-scheduler:
+    ensure: running
+  nova-novncproxy:
+    ensure: running
+  nova-conductor:
+    ensure: running
+  nova-api:
+    ensure: running
+  nova-consoleauth:
+    ensure: running
+  nova-cert:
+    ensure: running

fuelweb_test/config_templates/nova_cpu.yaml

@@ -2,3 +2,7 @@
 nova_config:
   DEFAULT/cpu_allocation_ratio:
     value: "1.0"
+    notify: "Service[nova-scheduler]"
+service:
+  nova-scheduler:
+    ensure: running

fuelweb_test/config_templates/nova_cpu_old.yaml

@@ -2,3 +2,7 @@
 nova_config:
   DEFAULT/cpu_allocation_ratio:
     ensure: absent
+    notify: "Service[nova-scheduler]"
+service:
+  nova-scheduler:
+    ensure: running

fuelweb_test/config_templates/nova_disk.yaml

@@ -2,3 +2,7 @@
 nova_config:
   DEFAULT/default_ephemeral_format:
     value: ext4
+    notify: "Service[nova-compute]"
+service:
+  nova-compute:
+    ensure: running

fuelweb_test/config_templates/nova_disk_cinder_role.yaml

@@ -2,5 +2,10 @@
 nova_config:
   DEFAULT/default_ephemeral_format:
     value: "ext3"
+    notify: "Service[nova-compute]"
   DEFAULT/verbose:
     value: "False"
+    notify: "Service[nova-compute]"
+service:
+  nova-compute:
+    ensure: running

fuelweb_test/config_templates/nova_quota.yaml

@@ -2,5 +2,12 @@
 nova_config:
   DEFAULT/quota_driver:
     value: nova.quota.DbQuotaDriver
+    notify:
+    - "Service[nova-api]"
   DEFAULT/quota_instances:
     value: "1"
+    notify:
+    - "Service[nova-api]"
+service:
+  nova-api:
+    ensure: running

fuelweb_test/tests/test_services_reconfiguration.py

@@ -562,14 +562,12 @@ class ServicesReconfiguration(TestBasic):
             1. Revert snapshot "basic_env_for_reconfiguration"
             2. Upload a new openstack configuration
             3. Get uptime of process "nova-api" on each controller
-            4. Get uptime of process "nova-compute" on each compute
+            4. Apply a new quota driver and quota_instances to all nodes
-            5. Apply a new quota driver and quota_instances to all nodes
+            5. Wait for configuration applying
-            6. Wait for configuration applying
+            6. Verify uptime of process "nova-api" on each controller
-            7. Verify uptime of process "nova-api" on each controller
+            7. Verify nova config settings
-            8. Verify uptime of process "nova-compute" on each compute
+            8. Create new instance
-            9. Verify nova config settings
+            9. Try to create one more, verify that it is impossible
-            10. Create new instance
-            11. Try to create one more, verify that it is impossible
 
         Snapshot: reconfigure_nova_quota
 
@@ -581,9 +579,6 @@ class ServicesReconfiguration(TestBasic):
         controllers = self.fuel_web.get_nailgun_cluster_nodes_by_roles(
             cluster_id, ['controller'])
 
-        computes = self.fuel_web.get_nailgun_cluster_nodes_by_roles(
-            cluster_id, ['compute'])
-
         self.show_step(2)
         config = utils.get_config_template('nova_quota')
         structured_config = get_structured_config_dict(config)
@@ -593,26 +588,19 @@ class ServicesReconfiguration(TestBasic):
         uptimes = self.get_service_uptime(controllers, 'nova-api')
 
         self.show_step(4)
-        uptimes_comp = self.get_service_uptime(computes, 'nova-compute')
-
-        self.show_step(5)
         task = self.fuel_web.client.apply_configuration(cluster_id)
 
-        self.show_step(6)
+        self.show_step(5)
         self.fuel_web.assert_task_success(task, timeout=900, interval=5)
 
-        self.show_step(7)
+        self.show_step(6)
         self.check_service_was_restarted(controllers, uptimes, 'nova-api')
 
-        self.show_step(8)
+        self.show_step(7)
-        self.check_service_was_restarted(computes, uptimes_comp,
-                                         'nova-compute')
-
-        self.show_step(9)
         self.check_config_on_remote(controllers, structured_config)
 
-        self.show_step(10)
+        self.show_step(8)
-        self.show_step(11)
+        self.show_step(9)
         os_conn = os_actions.OpenStackActions(
             self.fuel_web.get_public_vip(cluster_id))