diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one
index 3a2e6ce979..507a30b060 100644
--- a/ansible/inventory/all-in-one
+++ b/ansible/inventory/all-in-one
@@ -87,10 +87,12 @@ control
 [ceilometer:children]
 control
 
-# Tempest
 [tempest:children]
 control
 
+[watcher:children]
+control
+
 # Additional control implemented here. These groups allow you to control which
 # services run on which hosts at a per-service level.
 #
@@ -252,3 +254,13 @@ compute
 # Multipathd
 [multipathd:children]
 compute
+
+# Watcher
+[watcher-api:children]
+watcher
+
+[watcher-engine:children]
+watcher
+
+[watcher-applier:children]
+watcher
diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode
index 4d08cba778..d1f9bf0657 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -103,6 +103,9 @@ control
 [tempest:children]
 control
 
+[watcher:children]
+control
+
 # Additional control implemented here. These groups allow you to control which
 # services run on which hosts at a per-service level.
 #
@@ -264,3 +267,13 @@ compute
 # Multipathd
 [multipathd:children]
 compute
+
+# Watcher
+[watcher-api:children]
+watcher
+
+[watcher-engine:children]
+watcher
+
+[watcher-applier:children]
+watcher
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index b109b0d6ff..290b729865 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -125,6 +125,7 @@ neutron_external_interface: "eth1"
 #enable_neutron_qos: "no"
 #enable_swift: "no"
 #enable_tempest: "no"
+#enable_watcher: "no"
 
 
 ###################
diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml
index 1650a548c7..b026cb89a7 100644
--- a/etc/kolla/passwords.yml
+++ b/etc/kolla/passwords.yml
@@ -61,6 +61,9 @@ mistral_keystone_password:
 ceilometer_database_password:
 ceilometer_keystone_password:
 
+watcher_database_password:
+watcher_keystone_password:
+
 horizon_secret_key:
 
 telemetry_secret_key: