From 04925dc8c703069c7b0797b995cfb205e72329dd Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Fri, 8 Jan 2016 02:35:15 +0000 Subject: [PATCH 1/3] [corey.bryant,r=trivial] Enable sync of payload.archive --- charm-helpers-hooks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index 1c2d6c0a..ee82b34b 100644 --- a/charm-helpers-hooks.yaml +++ b/charm-helpers-hooks.yaml @@ -11,7 +11,7 @@ include: - cluster - contrib.python - contrib.unison - - payload.execd + - payload - contrib.peerstorage - contrib.network.ip - contrib.python.packages From afa48819d96e72547ff8e927ce7bb2b2d7fd745b Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Fri, 8 Jan 2016 02:37:35 +0000 Subject: [PATCH 2/3] [corey.bryant,r=osci] Sync charm-helpers. --- charmhelpers/contrib/openstack/context.py | 14 ++++++++++++-- .../contrib/openstack/templates/haproxy.cfg | 5 +++-- charmhelpers/contrib/openstack/utils.py | 15 ++++++--------- charmhelpers/fetch/giturl.py | 3 --- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/charmhelpers/contrib/openstack/context.py b/charmhelpers/contrib/openstack/context.py index 25125ded..e930bf37 100644 --- a/charmhelpers/contrib/openstack/context.py +++ b/charmhelpers/contrib/openstack/context.py @@ -57,6 +57,7 @@ from charmhelpers.core.host import ( get_nic_hwaddr, mkdir, write_file, + pwgen, ) from charmhelpers.contrib.hahelpers.cluster import ( determine_apache_port, @@ -87,6 +88,8 @@ from charmhelpers.contrib.network.ip import ( is_bridge_member, ) from charmhelpers.contrib.openstack.utils import get_host_ip +from charmhelpers.core.unitdata import kv + CA_CERT_PATH = '/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt' ADDRESS_TYPES = ['admin', 'internal', 'public'] @@ -636,11 +639,18 @@ class HAProxyContext(OSContextGenerator): ctxt['ipv6'] = True ctxt['local_host'] = 'ip6-localhost' ctxt['haproxy_host'] = '::' - ctxt['stat_port'] = ':::8888' else: ctxt['local_host'] = '127.0.0.1' ctxt['haproxy_host'] = '0.0.0.0' - ctxt['stat_port'] = ':8888' + + ctxt['stat_port'] = '8888' + + db = kv() + ctxt['stat_password'] = db.get('stat-password') + if not ctxt['stat_password']: + ctxt['stat_password'] = db.set('stat-password', + pwgen(32)) + db.flush() for frontend in cluster_hosts: if (len(cluster_hosts[frontend]['backends']) > 1 or diff --git a/charmhelpers/contrib/openstack/templates/haproxy.cfg b/charmhelpers/contrib/openstack/templates/haproxy.cfg index 8721d8a1..32b62767 100644 --- a/charmhelpers/contrib/openstack/templates/haproxy.cfg +++ b/charmhelpers/contrib/openstack/templates/haproxy.cfg @@ -33,13 +33,14 @@ defaults timeout server 30000 {%- endif %} -listen stats {{ stat_port }} +listen stats + bind {{ local_host }}:{{ stat_port }} mode http stats enable stats hide-version stats realm Haproxy\ Statistics stats uri / - stats auth admin:password + stats auth admin:{{ stat_password }} {% if frontends -%} {% for service, ports in service_ports.items() -%} diff --git a/charmhelpers/contrib/openstack/utils.py b/charmhelpers/contrib/openstack/utils.py index 3cfc983e..2af4476d 100644 --- a/charmhelpers/contrib/openstack/utils.py +++ b/charmhelpers/contrib/openstack/utils.py @@ -593,7 +593,7 @@ def _git_yaml_load(projects_yaml): return yaml.load(projects_yaml) -def git_clone_and_install(projects_yaml, core_project, depth=1): +def git_clone_and_install(projects_yaml, core_project): """ Clone/install all specified OpenStack repositories. @@ -643,6 +643,9 @@ def git_clone_and_install(projects_yaml, core_project, depth=1): for p in projects['repositories']: repo = p['repository'] branch = p['branch'] + depth = '1' + if 'depth' in p.keys(): + depth = p['depth'] if p['name'] == 'requirements': repo_dir = _git_clone_and_install_single(repo, branch, depth, parent_dir, http_proxy, @@ -687,19 +690,13 @@ def _git_clone_and_install_single(repo, branch, depth, parent_dir, http_proxy, """ Clone and install a single git repository. """ - dest_dir = os.path.join(parent_dir, os.path.basename(repo)) - if not os.path.exists(parent_dir): juju_log('Directory already exists at {}. ' 'No need to create directory.'.format(parent_dir)) os.mkdir(parent_dir) - if not os.path.exists(dest_dir): - juju_log('Cloning git repo: {}, branch: {}'.format(repo, branch)) - repo_dir = install_remote(repo, dest=parent_dir, branch=branch, - depth=depth) - else: - repo_dir = dest_dir + juju_log('Cloning git repo: {}, branch: {}'.format(repo, branch)) + repo_dir = install_remote(repo, dest=parent_dir, branch=branch, depth=depth) venv = os.path.join(parent_dir, 'venv') diff --git a/charmhelpers/fetch/giturl.py b/charmhelpers/fetch/giturl.py index bbf89d5c..a7ce90a0 100644 --- a/charmhelpers/fetch/giturl.py +++ b/charmhelpers/fetch/giturl.py @@ -22,7 +22,6 @@ from charmhelpers.fetch import ( filter_installed_packages, apt_install, ) -from charmhelpers.core.host import mkdir if filter_installed_packages(['git']) != []: apt_install(['git']) @@ -62,8 +61,6 @@ class GitUrlFetchHandler(BaseFetchHandler): else: dest_dir = os.path.join(os.environ.get('CHARM_DIR'), "fetched", branch_name) - if not os.path.exists(dest_dir): - mkdir(dest_dir, perms=0o755) try: self.clone(source, dest_dir, branch, depth) except OSError as e: From 9783bb17e72cd44f7b368e66535c2841902619b8 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Fri, 8 Jan 2016 19:52:42 +0000 Subject: [PATCH 3/3] [corey.bryant,r=trivial] Fix unit test failures --- charmhelpers/contrib/openstack/context.py | 2 ++ unit_tests/test_keystone_contexts.py | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/charmhelpers/contrib/openstack/context.py b/charmhelpers/contrib/openstack/context.py index e930bf37..7cffe772 100644 --- a/charmhelpers/contrib/openstack/context.py +++ b/charmhelpers/contrib/openstack/context.py @@ -647,7 +647,9 @@ class HAProxyContext(OSContextGenerator): db = kv() ctxt['stat_password'] = db.get('stat-password') + print "ctxt[\'stat_password\'] = %s" % ctxt['stat_password'] if not ctxt['stat_password']: + print "HELLO AGAIN" ctxt['stat_password'] = db.set('stat-password', pwgen(32)) db.flush() diff --git a/unit_tests/test_keystone_contexts.py b/unit_tests/test_keystone_contexts.py index ef732648..c8cd1329 100644 --- a/unit_tests/test_keystone_contexts.py +++ b/unit_tests/test_keystone_contexts.py @@ -97,10 +97,11 @@ class TestKeystoneContexts(CharmTestCase): @patch('charmhelpers.contrib.openstack.context.related_units') @patch('charmhelpers.contrib.openstack.context.relation_get') @patch('charmhelpers.contrib.openstack.context.log') + @patch('charmhelpers.contrib.openstack.context.kv') @patch('__builtin__.open') def test_haproxy_context_service_enabled( - self, mock_open, mock_log, mock_relation_get, mock_related_units, - mock_unit_get, mock_relation_ids, mock_config, + self, mock_open, mock_kv, mock_log, mock_relation_get, + mock_related_units, mock_unit_get, mock_relation_ids, mock_config, mock_get_address_in_network, mock_get_netmask_for_address, mock_api_port): os.environ['JUJU_UNIT_NAME'] = 'keystone' @@ -114,6 +115,7 @@ class TestKeystoneContexts(CharmTestCase): mock_get_netmask_for_address.return_value = '255.255.255.0' self.determine_apache_port.return_value = '34' mock_api_port.return_value = '12' + mock_kv().get.return_value = 'abcdefghijklmnopqrstuvwxyz123456' ctxt = context.HAProxyContext() @@ -124,7 +126,8 @@ class TestKeystoneContexts(CharmTestCase): 'public_port': '12'}, 'local_host': '127.0.0.1', 'haproxy_host': '0.0.0.0', - 'stat_port': ':8888', + 'stat_port': '8888', + 'stat_password': 'abcdefghijklmnopqrstuvwxyz123456', 'service_ports': {'admin-port': ['12', '34'], 'public-port': ['12', '34']}, 'default_backend': '1.2.3.4',