diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one
index 3a2e6ce9798118314cb315a9db51f98464f91e0a..507a30b060e7be5fe8c36c16714ee33db31fc542 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 4d08cba778e8e58337f5662b7c3dcd91f69385c9..d1f9bf065757502fb211782c0f95bc5b149f25ca 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 b109b0d6ff542940529105e1b03accee956e9b5d..290b72986577be6534ec9559a91ee5c7cf75c0ee 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 1650a548c7c2c841a8c87accfc8375a253b28552..b026cb89a790abfb5cdf367a606edb4982622cd4 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: