diff --git a/tripleoclient/constants.py b/tripleoclient/constants.py
index 24f888c6e..9f6e59791 100644
--- a/tripleoclient/constants.py
+++ b/tripleoclient/constants.py
@@ -21,6 +21,7 @@ SERVICE_LIST = {
     'cinder': {'password_field': 'OVERCLOUD_CINDER_PASSWORD'},
     'cinderv2': {'password_field': 'OVERCLOUD_CINDER_PASSWORD'},
     'glance': {'password_field': 'OVERCLOUD_GLANCE_PASSWORD'},
+    'gnocchi': {'password_field': 'OVERCLOUD_GNOCCHI_PASSWORD'},
     'heat': {'password_field': 'OVERCLOUD_HEAT_PASSWORD'},
     'neutron': {'password_field': 'OVERCLOUD_NEUTRON_PASSWORD'},
     'nova': {'password_field': 'OVERCLOUD_NOVA_PASSWORD'},
diff --git a/tripleoclient/tests/test_utils.py b/tripleoclient/tests/test_utils.py
index 1a3e47944..376d87d1f 100644
--- a/tripleoclient/tests/test_utils.py
+++ b/tripleoclient/tests/test_utils.py
@@ -48,6 +48,7 @@ class TestPasswordsUtil(TestCase):
             mock.call('OVERCLOUD_CINDER_PASSWORD=PASSWORD\n'),
             mock.call('OVERCLOUD_DEMO_PASSWORD=PASSWORD\n'),
             mock.call('OVERCLOUD_GLANCE_PASSWORD=PASSWORD\n'),
+            mock.call('OVERCLOUD_GNOCCHI_PASSWORD=PASSWORD\n'),
             mock.call('OVERCLOUD_HAPROXY_STATS_PASSWORD=PASSWORD\n'),
             mock.call('OVERCLOUD_HEAT_PASSWORD=PASSWORD\n'),
             mock.call('OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD=PASSWORD\n'),
@@ -85,6 +86,7 @@ class TestPasswordsUtil(TestCase):
             'OVERCLOUD_CINDER_PASSWORD=PASSWORD\n',
             'OVERCLOUD_DEMO_PASSWORD=PASSWORD\n',
             'OVERCLOUD_GLANCE_PASSWORD=PASSWORD\n',
+            'OVERCLOUD_GNOCCHI_PASSWORD=PASSWORD\n',
             'OVERCLOUD_HAPROXY_STATS_PASSWORD=PASSWORD\n',
             'OVERCLOUD_HEAT_PASSWORD=PASSWORD\n',
             'OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD=PASSWORD\n',
diff --git a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
index 6ee00be05..2d82c2ddf 100644
--- a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
+++ b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
@@ -151,6 +151,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
             'CinderPassword': 'password',
             'ExtraConfig': '{}',
             'GlancePassword': 'password',
+            'GnocchiPassword': 'password',
             'HAProxyStatsPassword': 'password',
             'HeatPassword': 'password',
             'HeatStackDomainAdminPassword': 'password',
@@ -310,6 +311,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
             'CinderPassword': 'password',
             'ExtraConfig': '{}',
             'GlancePassword': 'password',
+            'GnocchiPassword': 'password',
             'HAProxyStatsPassword': 'password',
             'HeatPassword': 'password',
             'HeatStackDomainAdminPassword': 'password',
diff --git a/tripleoclient/utils.py b/tripleoclient/utils.py
index fbb847c8d..61d74de06 100644
--- a/tripleoclient/utils.py
+++ b/tripleoclient/utils.py
@@ -45,6 +45,7 @@ _PASSWORD_NAMES = (
     "OVERCLOUD_CINDER_PASSWORD",
     "OVERCLOUD_DEMO_PASSWORD",
     "OVERCLOUD_GLANCE_PASSWORD",
+    "OVERCLOUD_GNOCCHI_PASSWORD",
     "OVERCLOUD_HAPROXY_STATS_PASSWORD",
     "OVERCLOUD_HEAT_PASSWORD",
     "OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD",
diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py
index 2adf32e50..862ca24fc 100644
--- a/tripleoclient/v1/overcloud_deploy.py
+++ b/tripleoclient/v1/overcloud_deploy.py
@@ -75,6 +75,7 @@ class DeployOvercloud(command.Command):
             'OVERCLOUD_CINDER_PASSWORD']
         parameters['GlancePassword'] = passwords[
             'OVERCLOUD_GLANCE_PASSWORD']
+        parameters['GnocchiPassword'] = passwords['OVERCLOUD_GNOCCHI_PASSWORD']
         parameters['HAProxyStatsPassword'] = passwords[
             'OVERCLOUD_HAPROXY_STATS_PASSWORD']
         parameters['HeatPassword'] = passwords['OVERCLOUD_HEAT_PASSWORD']