From 1197d7f6f0de8bb10daa740dda40dc31b0465bb1 Mon Sep 17 00:00:00 2001
From: "Jay S. Bryant" <jungleboyj@electronicjungle.net>
Date: Mon, 12 Mar 2018 15:25:17 -0500
Subject: [PATCH] Avoid build system IP going into sample config

We should not show the IP address of the build system as
the sample default for my_ip in /etc/cinder/cinder.conf.sample .

This patch sets a sample_default that will be used instead.

Change-Id: If9ba07bb7f83c2ad3d89e2d5264c064117bbad23
closes-bug: 1755282
---
 cinder/common/config.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cinder/common/config.py b/cinder/common/config.py
index c186645dfd0..a6dc742d1f2 100644
--- a/cinder/common/config.py
+++ b/cinder/common/config.py
@@ -45,6 +45,7 @@ CONF.register_cli_opts(core_opts)
 
 global_opts = [
     cfg.HostAddressOpt('my_ip',
+                       sample_default='<HOST_IP_ADDRESS>',
                        default=netutils.get_my_ipv4(),
                        help='IP address of this host'),
     cfg.ListOpt('glance_api_servers',