From 54dcbc323d9c145a933523b9d212aeac33a2426f Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Wed, 30 Nov 2016 04:36:08 +0000
Subject: [PATCH] Complete changes to use /etc/nova/join.conf

Fix the remaining places that referenced /etc/join/join.conf to
use /etc/nova/join.conf instead.
---
 README.md                                   | 2 +-
 doc/source/configuration.rst                | 2 +-
 files/{api-paste.ini => join-api-paste.ini} | 0
 files/join.conf.template                    | 4 ++--
 man/novajoin-server.1                       | 6 +++---
 novajoin/configure_ipa.py                   | 2 +-
 scripts/novajoin-install                    | 2 +-
 setup.cfg                                   | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)
 rename files/{api-paste.ini => join-api-paste.ini} (100%)

diff --git a/README.md b/README.md
index fb4f0cf..bc5e18e 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ The installer takes the following options:
 Metadata REST Service Configuration
 ===================================
 
-The REST service is configured in /etc/join/join.conf in the DEFAULT
+The REST service is configured in /etc/nova/join.conf in the DEFAULT
 section.  It provides the following options:
 
 join_listen_port: The TCP port to listen on. Defaults to 9999.
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index 37f4615..58dfacf 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -1,7 +1,7 @@
 Configuration
 =============
 
-novajoin is configured via /etc/join/join.conf and consists of two
+novajoin is configured via /etc/nova/join.conf and consists of two
 configuration sections, DEFAULT and service_credentials.
 
 DEFAULT
diff --git a/files/api-paste.ini b/files/join-api-paste.ini
similarity index 100%
rename from files/api-paste.ini
rename to files/join-api-paste.ini
diff --git a/files/join.conf.template b/files/join.conf.template
index 1b5bc9d..20b5319 100644
--- a/files/join.conf.template
+++ b/files/join.conf.template
@@ -1,10 +1,10 @@
 [DEFAULT]
 join_listen_port = 9999
-api_paste_config = /etc/join/api-paste.ini
+api_paste_config = /etc/nova/join-api-paste.ini
 debug = True
 auth_strategy=keystone
 log_dir=/var/log/novajoin
-keytab = /etc/join/krb5.keytab
+keytab = /etc/nova/krb5.keytab
 url = https://$MASTER/ipa/json
 domain = $DOMAIN
 cacert = /etc/ipa/ca.crt
diff --git a/man/novajoin-server.1 b/man/novajoin-server.1
index e277c55..9659bee 100644
--- a/man/novajoin-server.1
+++ b/man/novajoin-server.1
@@ -22,7 +22,7 @@ in nova then the IPA host is generated at instance creation time rather
 than when needed.
 
 .SH "CONFIGURATION"
-The service is configured using \fB/etc/join/join.conf\fR. It consists
+The service is configured using \fB/etc/nova/join.conf\fR. It consists
 of two sections: DEFAULT and keystone_authtoken
 
 The DEFAULT section configures novajoin-server and keystone_authtoken
@@ -33,7 +33,7 @@ The DEFAULT section options are:
 \fRjoin_listen_port\fB = \fI9999\fR
 Port the service listens \fIon\fR
 .TP
-\fRapi_paste_config\fB = \fI/etc/join/api-paste.ini\fR
+\fRapi_paste_config\fB = \fI/etc/nova/join-api-paste.ini\fR
 Path to the Paste configuration file
 .TP
 \fRdebug\fB = \fIFalse\fR
@@ -42,7 +42,7 @@ Additional debug logging
 \fRauth_strategy\fB = \fIkeystone\fR
 Authentication strategy to use
 .TP
-\fRkeytab\fB = \fI/etc/join/krb5.keytab\fR
+\fRkeytab\fB = \fI/etc/nova/krb5.keytab\fR
 Keytab used to communicate with the IPA master
 .TP
 \fRurl\fB = \fIhttps://ipa.example.com/ipa/json\fR
diff --git a/novajoin/configure_ipa.py b/novajoin/configure_ipa.py
index 73ae5ae..10e3b79 100644
--- a/novajoin/configure_ipa.py
+++ b/novajoin/configure_ipa.py
@@ -38,7 +38,7 @@ class NovajoinRole(object):
     already exists.
     """
 
-    def __init__(self, keytab='/etc/join/krb5.keytab', user='nova'):
+    def __init__(self, keytab='/etc/nova/krb5.keytab', user='nova'):
         self.keytab = keytab
         self.user = user
         self.service = u'nova/%s' % self._get_fqdn()
diff --git a/scripts/novajoin-install b/scripts/novajoin-install
index 4c9091c..434bdb9 100755
--- a/scripts/novajoin-install
+++ b/scripts/novajoin-install
@@ -40,7 +40,7 @@ DATADIR = '/usr/share/novajoin'
 NOVADIR = '/etc/nova'
 IPACONF = '/etc/ipa/default.conf'
 NOVACONF = '/etc/nova/nova.conf'
-JOINCONF = '/etc/join/join.conf'
+JOINCONF = '/etc/nova/join.conf'
 
 
 LOGFILE = '/var/log/novajoin-install.log'
diff --git a/setup.cfg b/setup.cfg
index bd0d03f..a46769d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,7 +29,7 @@ data_files =
         files/cloud-config.json
         files/freeipa.json
         files/join.conf.template
-    /etc/join = files/api-paste.ini
+    /etc/nova = files/join-api-paste.ini
     /usr/sbin =
         scripts/novajoin-notify
         scripts/novajoin-server