openstack/charm-ceph-iscsi
Code Issues Proposed changes

Add required relations

Browse Source
This commit is contained in:
Liam Young 2020-02-29 14:48:49 +00:00
parent 98886e611a
commit 091e896bc7
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -4,3 +4,6 @@
[submodule "mod/interface-ceph-client"] [submodule "mod/interface-ceph-client"]
path = mod/interface-ceph-client path = mod/interface-ceph-client
url = https://github.com/gnuoy/oper-interface-ceph-client.git url = https://github.com/gnuoy/oper-interface-ceph-client.git
[submodule "mod/ops-openstack"]
path = mod/ops-openstack
url = https://github.com/gnuoy/ops-openstack.git

2
charm-prep.sh
View File

@ -8,4 +8,4 @@ git submodule init
git submodule update git submodule update
(cd lib; ln -s ../mod/operator/ops;) (cd lib; ln -s ../mod/operator/ops;)
(cd lib; ln -s ../mod/interface-ceph-client/interface_ceph_client.py;) (cd lib; ln -s ../mod/interface-ceph-client/interface_ceph_client.py;)
(cd lib; ln -s ../mod/ops_openstack/ops_openstack.py;) (cd lib; ln -s ../mod/ops-openstack/ops_openstack.py)

1
mod/ops-openstack Submodule

@ -0,0 +1 @@
Subproject commit 518b4fbdc4201394192048eaa5b4f9d4ef79c3cc

1
src/charm.py
View File

@ -79,6 +79,7 @@ class CephISCSIGatewayCharm(ops_openstack.OSBaseCharm):
'/etc/ceph/ceph.client.ceph-iscsi.keyring': ['rbd-target-api']} '/etc/ceph/ceph.client.ceph-iscsi.keyring': ['rbd-target-api']}
DEFAULT_TARGET = "iqn.2003-01.com.ubuntu.iscsi-gw:iscsi-igw" DEFAULT_TARGET = "iqn.2003-01.com.ubuntu.iscsi-gw:iscsi-igw"
REQUIRED_RELATIONS = ['ceph-client', 'cluster']
def __init__(self, framework, key): def __init__(self, framework, key):
super().__init__(framework, key) super().__init__(framework, key)