Fixup source configuration, config-changed

2013-03-18 13:52:29 +00:00
parent 8a4714997d
commit 3cab1d3d41
1 changed files with 1 additions and 3 deletions
--- a/hooks/keystone_hooks.py
+++ b/hooks/keystone_hooks.py
@@ -98,8 +98,7 @@ valid_services = {


 def install_hook():
-    if config["openstack-origin"] != "distro":
-        configure_installation_source(config["openstack-origin"])
+    utils.configure_source()
    utils.install(*packages)
    update_config_block('DEFAULT',
                public_port=cluster.determine_api_port(config["service-port"]))
@@ -387,7 +386,6 @@ def config_changed():
        configure_pki_tokens(config)

    utils.restart('keystone')
-    cluster_changed()


 def upgrade_charm():