Two Bugzillas related to CS url generation in the agent
Show replies by date
---
agent/audrey_agent.in.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/agent/audrey_agent.in.py b/agent/audrey_agent.in.py
index fb554d2..636bfd9 100755
--- a/agent/audrey_agent.in.py
+++ b/agent/audrey_agent.in.py
@@ -855,7 +855,7 @@ class CSClient(object):
Generate the Config Server (CS) URL.
'''
return '%s/%s/%s/%s' % \
- (self.cs_endpoint, url_type, self.version, self.cs_oauth_key)
+ (self.cs_endpoint.lower(), url_type, self.version, self.cs_oauth_key)
def _get(self, url, headers=None):
'''
--
1.7.7.5
---
agent/Makefile | 2 +-
agent/aeolus-audrey-agent.spec.in | 2 +-
agent/audrey_agent.in.py | 6 ++++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/agent/Makefile b/agent/Makefile
index fd53aca..bf53794 100644
--- a/agent/Makefile
+++ b/agent/Makefile
@@ -16,7 +16,7 @@
AUDREY_STARTUP_CACHE_DIR ?= $(HOME)/audrey-agent-cache
-VERSION = 0.4.2
+VERSION = 0.4.3
# For Release: 0..., set _audrey-agent_dev=1 so that we get extra_release.GIT-
# annotated rpm version strings.
diff --git a/agent/aeolus-audrey-agent.spec.in b/agent/aeolus-audrey-agent.spec.in
index 6e09af8..5f398db 100644
--- a/agent/aeolus-audrey-agent.spec.in
+++ b/agent/aeolus-audrey-agent.spec.in
@@ -15,7 +15,7 @@
#
Name: aeolus-audrey-agent
Version: @VERSION@
-Release: 15%{?dist}
+Release: 1%{?dist}
Summary: The Aeolus Audrey Startup Agent
Group: Applications/System
diff --git a/agent/audrey_agent.in.py b/agent/audrey_agent.in.py
index 636bfd9..d942c56 100755
--- a/agent/audrey_agent.in.py
+++ b/agent/audrey_agent.in.py
@@ -854,8 +854,10 @@ class CSClient(object):
Description:
Generate the Config Server (CS) URL.
'''
- return '%s/%s/%s/%s' % \
- (self.cs_endpoint.lower(), url_type, self.version, self.cs_oauth_key)
+ endpoint = '%s/%s' % (self.cs_endpoint.lower(), url_type)
+ if url_type != 'version':
+ endpoint = '%s/%s/%s' % (endpoint, self.version, self.cs_oauth_key)
+ return endpoint
def _get(self, url, headers=None):
'''
--
1.7.7.5