From 3462a55177e208090ae571f95037e3d0ff35cf89 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sat, 9 Nov 2024 17:19:44 +0900
Subject: [PATCH] Ignore generated sample config file

... also rename rootwra.conf because it should be actually used.

Change-Id: I5376c9993688eb893d0398c6f4e38c1660faabbc
---
 .gitignore                                            | 2 +-
 devstack/plugin.sh                                    | 2 +-
 etc/designate/{rootwrap.conf.sample => rootwrap.conf} | 0
 setup.cfg                                             | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename etc/designate/{rootwrap.conf.sample => rootwrap.conf} (100%)

diff --git a/.gitignore b/.gitignore
index 1abda2704..6aad7ef8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,6 @@ doc/source/_static/*.sample
 doc/build/*
 doc/source/api/*
 api-ref/build/*
-etc/designate/*.conf
+etc/designate/*.conf.sample
 etc/designate/*.yaml
 var/*
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index edc99a081..05d8752ae 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -95,7 +95,7 @@ function configure_designate {
     iniset $DESIGNATE_CONF oslo_messaging_notifications topics "$DESIGNATE_NOTIFICATION_TOPICS"
 
     # Root Wrap
-    sudo cp $DESIGNATE_DIR/etc/designate/rootwrap.conf.sample $DESIGNATE_ROOTWRAP_CONF
+    sudo cp $DESIGNATE_DIR/etc/designate/rootwrap.conf $DESIGNATE_ROOTWRAP_CONF
     iniset $DESIGNATE_ROOTWRAP_CONF DEFAULT filters_path $DESIGNATE_DIR/etc/designate/rootwrap.d root-helper
 
     # Oslo Concurrency
diff --git a/etc/designate/rootwrap.conf.sample b/etc/designate/rootwrap.conf
similarity index 100%
rename from etc/designate/rootwrap.conf.sample
rename to etc/designate/rootwrap.conf
diff --git a/setup.cfg b/setup.cfg
index cc0d5e3cd..56c8a35f6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,7 +29,7 @@ packages =
 data_files =
     etc/designate =
         etc/designate/api-paste.ini
-        etc/designate/rootwrap.conf.sample
+        etc/designate/rootwrap.conf
     etc/designate/rootwrap.d = etc/designate/rootwrap.d/*
 
 [extras]