From d55333ea02f5ddd3810a8f6f2fd3d89185f33157 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Tue, 23 May 2017 14:20:13 +0300
Subject: [PATCH] Use novajoin-specific directory for configurations

This will allow us to stop depending on openstack-nova-common and to
containerize easier.

Change-Id: I4c402ecd558634ebeaeae34b134083512628025d
---
 README.rst               | 8 ++++----
 novajoin/config.py       | 6 +++---
 scripts/novajoin-install | 2 +-
 setup.cfg                | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.rst b/README.rst
index 7436253..58d9b99 100644
--- a/README.rst
+++ b/README.rst
@@ -104,7 +104,7 @@ novajoin REST service and enable notifications in
     notify_on_state_change = vm_state
 
 Novajoin enables keystone authentication by default, as seen in
-**/etc/nova/join-api-paste.ini**. So credentials need to be set for nova to be
+**/etc/novajoin/join-api-paste.ini**. So credentials need to be set for nova to be
 able to communicate with novajoin. This we can set in the
 ``[vendordata_dynamic_auth]`` section of **/etc/nova/nova.conf**::
 
@@ -139,7 +139,7 @@ so that the glance metadata upload can occur.
 
 This will:
 
-- copy the cloud-init and enrollment script to **/etc/nova**
+- copy the cloud-init and enrollment script to **/etc/novajoin**
 - obtain a keytab to be used to authenticate against IPA when
   doing host management
 - call out to a script to create the requisite permissions and
@@ -163,7 +163,7 @@ The installer takes the following options::
 Metadata REST Service Configuration
 ===================================
 
-The REST service is configured in **/etc/nova/join.conf** in the DEFAULT
+The REST service is configured in **/etc/novajoin/join.conf** in the DEFAULT
 section.  It provides the following options:
 
 - join_listen_port: The TCP port to listen on. Defaults to 9090.
@@ -184,7 +184,7 @@ section.  It provides the following options:
           DNS label. This will convert invalid values to a dash (-)
           dropping leading and trailing dashes.
 
-One must also configure the authtoken middleware in **/etc/nova/join.conf** as
+One must also configure the authtoken middleware in **/etc/novajoin/join.conf** as
 specified in the `Keystone middleware documentation`_.
 
 .. _`Keystone middleware documentation`: https://docs.openstack.org/developer/keystonemiddleware/middlewarearchitecture.html#configuration
diff --git a/novajoin/config.py b/novajoin/config.py
index d0e4293..aa1044e 100644
--- a/novajoin/config.py
+++ b/novajoin/config.py
@@ -28,7 +28,7 @@ service_opts = [
     cfg.PortOpt('join_listen_port',
                 default=9090,
                 help='Port to listen on'),
-    cfg.StrOpt('keytab', default='/etc/nova/krb5.keytab',
+    cfg.StrOpt('keytab', default='/etc/novajoin/krb5.keytab',
                help='Kerberos client keytab file'),
     cfg.StrOpt('domain', default=None,
                help='Domain for new hosts'),
@@ -88,14 +88,14 @@ def find_config_files():
 
       ~/.join/join.conf
       ~/join.conf
-      /etc/nova/join.conf
+      /etc/novajoin/join.conf
       /etc/join.conf
       /etc/join/join.conf
     """
     cfg_dirs = [
         _fixpath('~/.join/'),
         _fixpath('~'),
-        '/etc/nova/',
+        '/etc/novajoin/',
         '/etc'
         '/etc/join/'
     ]
diff --git a/scripts/novajoin-install b/scripts/novajoin-install
index 1423b58..608d1e2 100755
--- a/scripts/novajoin-install
+++ b/scripts/novajoin-install
@@ -41,7 +41,7 @@ DATADIR = '/usr/share/novajoin'
 NOVADIR = '/etc/nova'
 IPACONF = '/etc/ipa/default.conf'
 NOVACONF = '/etc/nova/nova.conf'
-JOINCONF = '/etc/nova/join.conf'
+JOINCONF = '/etc/novajoin/join.conf'
 
 
 LOGFILE = '/var/log/novajoin-install.log'
diff --git a/setup.cfg b/setup.cfg
index 10e9df8..8157bbe 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -27,7 +27,7 @@ setup-hooks =
 data_files =
     /usr/share/novajoin =
         files/freeipa.json
-    /etc/nova =
+    /etc/novajoin =
         files/join-api-paste.ini
         files/cloud-config-novajoin.json
     /usr/sbin =