diff --git a/config.yaml b/config.yaml index fd57211..e89628c 100644 --- a/config.yaml +++ b/config.yaml @@ -13,7 +13,7 @@ options: type: string default: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz" description: | - Web addressable location of OpenDayLight binaries to install. + Web addressable location of OpenDayLight binaries to install If unset, the charm will install binaries from the opendaylight-karaf package. @@ -21,7 +21,10 @@ options: type: string description: | Package sources to install. Can be used to specify where to isntall the - opendaylight-karaf package from. + opendaylight-karaf package from + install-keys: + type: string + description: Apt keys for package install sources http-proxy: type: string default: diff --git a/hooks/odl_controller_hooks.py b/hooks/odl_controller_hooks.py index 916c475..5c2aae9 100755 --- a/hooks/odl_controller_hooks.py +++ b/hooks/odl_controller_hooks.py @@ -53,7 +53,7 @@ def controller_api_joined(r_id=None): @hooks.hook() def install(): if config["install-sources"]: - configure_sources(update=True, install_key="install_sources") + configure_sources(update=True, sources_var="install_sources") # install packages apt_install(PACKAGES, fatal=True)