From f1fb47841a89fc9a0970a19983b71c7f2a9a4f9b Mon Sep 17 00:00:00 2001
From: Chi Lo <cl566n@att.com>
Date: Wed, 22 Aug 2018 05:56:36 -0500
Subject: [PATCH] [456932] Armada Manifest changes for configmap and endpoints

- Modified Docker file

Change-Id: I883bb43d183abae01a21f33cc960c4608220c8ec
---
 Dockerfile | 13 +++++++------
 setup.cfg  | 11 +++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 71548598..f9b5f2fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,14 +47,15 @@ RUN python setup.py install
 RUN useradd -u 1000 -ms /bin/bash ranger
 
 # Change permissions
-RUN chown -R ranger: /home/ranger \
+RUN  mkdir -p /etc/ranger \
     && mkdir /var/log/ranger \
     && mkdir -p /opt/app \
-    && mkdir /opt/app/git_repo \
+    && mkdir /home/ranger/git_repo \
     && chown -R ranger: /var/log/ranger \
-    && mv /tmp/ranger /opt/app/ranger
+    && mv /tmp/ranger /home/ranger/ranger \
+    && chown -R ranger: /home/ranger \
+    && chown -R ranger: /etc/ranger
 
 # Set work directory
-USER root
-WORKDIR /opt/app/ranger
-
+USER ranger
+WORKDIR /home/ranger
diff --git a/setup.cfg b/setup.cfg
index 8db558d4..849c3889 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [metadata]
-name = orm
+name = ranger
 version = 2016.3.0
 summary = OpenStack Resource Manager
 description-file =
@@ -23,7 +23,10 @@ setup-hooks =
     pbr.hooks.setup_hook
 
 [files]
-packages = orm
+packages = ranger
+data_files =
+    /etc/ranger =
+       etc/ranger/ranger.conf
 
 [entry_points]
 console_scripts=
@@ -48,10 +51,10 @@ upload-dir = doc/build/html
 
 [compile_catalog]
 directory = orm/locale
-domain = orm
+domain = ranger
 
 [update_catalog]
-domain = orm
+domain = ranger
 output_dir = orm/locale
 input_file = orm/locale/orm.pot