diff --git a/charm-init.sh b/charm-init.sh index 06fa76c..e400cde 100755 --- a/charm-init.sh +++ b/charm-init.sh @@ -15,8 +15,12 @@ else git -C mod/operator pull origin master git -C mod/ops-openstack pull origin master git -C mod/ops-interface-ceph-client pull origin master -# git -C mod/ops-interface-tls-certificates pull origin master + git -C mod/ops-interface-tls-certificates pull origin master git -C mod/charm-helpers pull origin master + # pbr seems unable to detect the current tag when installing + # from a local checkout using a git submodule. To work around this + # manually set the version. + export PBR_VERSION=$(cd mod/charm-helpers; git describe --tags) pip install -t lib -r build-requirements.txt --upgrade fi diff --git a/metadata.yaml b/metadata.yaml index 1c95347..e96aab0 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -15,7 +15,6 @@ subordinate: false min-juju-version: 2.7.6 extra-bindings: public: - cluster: requires: ceph-client: interface: ceph-client diff --git a/mod/charm-helpers b/mod/charm-helpers index b4aa4e3..87fc7ee 160000 --- a/mod/charm-helpers +++ b/mod/charm-helpers @@ -1 +1 @@ -Subproject commit b4aa4e3398e7406dbf0f76a23f91afa6a72aed1a +Subproject commit 87fc7ee50662f14abe55d9fe0d02ec20d128379f diff --git a/mod/operator b/mod/operator index ccf1dce..59dd098 160000 --- a/mod/operator +++ b/mod/operator @@ -1 +1 @@ -Subproject commit ccf1dce276141d1e8641d63382bb6c3055eee731 +Subproject commit 59dd09875421668366ffcaff123bec34a0054ec3 diff --git a/mod/ops-interface-tls-certificates b/mod/ops-interface-tls-certificates index d03a251..f6e6ec1 160000 --- a/mod/ops-interface-tls-certificates +++ b/mod/ops-interface-tls-certificates @@ -1 +1 @@ -Subproject commit d03a251e87f02528789af0eb4cce88e471847e68 +Subproject commit f6e6ec1b1d6a317aaeb2cb696e3ec7c1a7c3cd09 diff --git a/mod/ops-openstack b/mod/ops-openstack index 18b8f1f..460b389 160000 --- a/mod/ops-openstack +++ b/mod/ops-openstack @@ -1 +1 @@ -Subproject commit 18b8f1fcfe7bee87217e7d3152e377c2c3e3f2ff +Subproject commit 460b389811d25514c7ac280ff7c8b2f7c17dd790 diff --git a/src/charm.py b/src/charm.py index 949630f..ab2f10b 100755 --- a/src/charm.py +++ b/src/charm.py @@ -130,8 +130,8 @@ class CephISCSIGatewayCharmBase(ops_openstack.OSBaseCharm): release = 'default' - def __init__(self, framework, key): - super().__init__(framework, key) + def __init__(self, framework): + super().__init__(framework) logging.info("Using {} class".format(self.release)) self.state.set_default( target_created=False, @@ -156,7 +156,7 @@ class CephISCSIGatewayCharmBase(ops_openstack.OSBaseCharm): self.render_config) self.framework.observe( self.peers.on.has_peers, - self) + self.on_has_peers) self.framework.observe( self.peers.on.allowed_ips_changed, self.render_config) @@ -174,10 +174,10 @@ class CephISCSIGatewayCharmBase(ops_openstack.OSBaseCharm): self.render_config) self.framework.observe( self.on.create_target_action, - self) + self.on_create_target_action) self.framework.observe( self.on.add_trusted_ip_action, - self) + self.on_add_trusted_ip_action) def on_install(self, event): if ch_host.is_container():