projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replacing ldap_user_enabled_default type from boolean to string
[osm/devops.git]
/
installers
/
charm
/
keystone
/
src
/
charm.py
diff --git
a/installers/charm/keystone/src/charm.py
b/installers/charm/keystone/src/charm.py
index
72d7090
..
a8c69fe
100755
(executable)
--- a/
installers/charm/keystone/src/charm.py
+++ b/
installers/charm/keystone/src/charm.py
@@
-23,33
+23,25
@@
# pylint: disable=E0213
# pylint: disable=E0213
-import json
-import logging
-from cryptography.fernet import Fernet
from datetime import datetime
from datetime import datetime
-from typing import Optional, NoReturn, List, Tuple
from ipaddress import ip_network
from ipaddress import ip_network
+import json
+import logging
+from typing import List, NoReturn, Optional, Tuple
from urllib.parse import urlparse
from urllib.parse import urlparse
+from cryptography.fernet import Fernet
from ops.main import main
from ops.main import main
-
from opslib.osm.charm import CharmedOsmBase, RelationsMissing
from opslib.osm.charm import CharmedOsmBase, RelationsMissing
-
+from opslib.osm.interfaces.keystone import KeystoneServer
+from opslib.osm.interfaces.mysql import MysqlClient
from opslib.osm.pod import (
ContainerV3Builder,
from opslib.osm.pod import (
ContainerV3Builder,
- PodSpecV3Builder,
FilesV3Builder,
IngressResourceV3Builder,
FilesV3Builder,
IngressResourceV3Builder,
+ PodSpecV3Builder,
)
)
-
-
-from opslib.osm.validator import (
- ModelValidator,
- validator,
-)
-
-from opslib.osm.interfaces.mysql import MysqlClient
-from opslib.osm.interfaces.keystone import KeystoneServer
+from opslib.osm.validator import ModelValidator, validator
logger = logging.getLogger(__name__)
logger = logging.getLogger(__name__)