diff --git a/cinder/config/generate_cinder_opts.py b/cinder/config/generate_cinder_opts.py
index 60c9fafbbe4..69a2081a184 100644
--- a/cinder/config/generate_cinder_opts.py
+++ b/cinder/config/generate_cinder_opts.py
@@ -47,6 +47,18 @@ if __name__ == "__main__":
     """)
     opt_file.write(license_str)
 
+    edit_header = textwrap.dedent(
+        """
+        ###################################################################
+        # WARNING!
+        #
+        # Do not edit this file directly. This file should be generated by
+        # running the command "tox -e genopts" any time a config option
+        # has been added, changed, or removed.
+        ###################################################################\n
+    """)
+    opt_file.write(edit_header)
+
     opt_file.write("import itertools\n\n")
 
     # NOTE(geguileo): We need to register all OVOs before importing any other
diff --git a/cinder/opts.py b/cinder/opts.py
index 1e44001e608..3231be1dddf 100644
--- a/cinder/opts.py
+++ b/cinder/opts.py
@@ -12,6 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+###################################################################
+# WARNING!
+#
+# Do not edit this file directly. This file should be generated by
+# running the command "tox -e genopts" any time a config option
+# has been added, changed, or removed.
+###################################################################
+
 import itertools
 
 from cinder import objects