Virtual pc ldap suport

hackfest_virtual-pc_vnfd/charms/virtual-pc/src/charm.py

@@ -70,7 +70,7 @@ class VirtualPCCharm(CharmBase, InstallProgress):
 
         self._stored.set_default()
         self.last_status_update = time.time()
-        self.state.set_default(ldap_installed=False)
+        self._stored.set_default(ldap_installed=False)
 
         # Basic hooks
         self.framework.observe(self.on.install, self._on_install)
@@ -87,6 +87,7 @@ class VirtualPCCharm(CharmBase, InstallProgress):
         self.framework.observe(self.on["remove-package"].action, self._remove_package)
         self.framework.observe(self.on["remove-snap"].action, self._remove_snap)
         self.framework.observe(self.on["update-system"].action, self._update_system)
+        self.framework.observe(self.on["integrate-ldap"].action, self._ldap_integration)
 
         # Relations hooks
 
@@ -204,19 +205,17 @@ class VirtualPCCharm(CharmBase, InstallProgress):
 
     def _ldap_integration(self, event):
         self.unit.status = MaintenanceStatus("Configuring Ldap autentication")
-        _configure_ldap(event.params["ldap_host"],
-                        event.params["ldap_domain"],
-                        event.params["ldap_password"])
-        if not self.state.ldap_installed:
+        self._configure_ldap(event.params["ldap_host"], event.params["ldap_domain"], event.params["ldap_password"])
+        if not self._stored.ldap_installed:
             install_apt(packages=["ldap-auth-client", "nscd"],
                         update=True, progress=self)
             # edit /etc/nsswitch.conf
-            shell("sudo sed -E -i '/passwd|group/ !b; s/$/ ldap/' /etc/nsswitch.conf")
+            shell("sudo sed -E -i '/passwd|group|shadow/ !b; s/$/ ldap/' /etc/nsswitch.conf")
             # restart nscd
             shell("sudo systemctl restart nscd")
             #create a home directory when user login
             shell("echo session required pam_mkhomedir.so skel=/etc/skel umask=077 | sudo tee /etc/pam.d/common-session")
-            self.state.ldap_installed = True
+            self._stored.ldap_installed = True
         else:
             shell("dpkg-reconfigure -f noninteractive ldap-auth-client")
         self.unit.status = ActiveStatus("Ldap autentication configured")
@@ -231,18 +230,18 @@ class VirtualPCCharm(CharmBase, InstallProgress):
             status_msg = "Ready"
         return status_type(status_msg)
 
-    def _configure_ldap(host, domain, password):
+    def _configure_ldap(self, host, domain, password):
         #configure ldap-auth-config with debconf
         shell("echo ldap-auth-config ldap-auth-config/rootbindpw password {} | sudo debconf-set-selections".format(password))
         shell("echo ldap-auth-config ldap-auth-config/bindpw password {} | sudo debconf-set-selections".format(password))
-        shell("echo ldap-auth-config ldap-auth-config/binddn string cn=admin,dc={},dc={} | sudo debconf-set-selections".format(domin.split(".")))
+        shell("echo ldap-auth-config ldap-auth-config/binddn string cn=admin,dc={},dc={} | sudo debconf-set-selections".format(domain.split(".")[0],domain.split(".")[1]))
         shell("echo ldap-auth-config ldap-auth-config/dblogin boolean false | sudo debconf-set-selections")
-        shell("echo ldap-auth-config ldap-auth-config/rootbinddn string cn=admin,dc={},dc={} | sudo debconf-set-selections".format(domin.split("."))
+        shell("echo ldap-auth-config ldap-auth-config/rootbinddn string cn=admin,dc={},dc={} | sudo debconf-set-selections".format(domain.split(".")[0],domain.split(".")[1]))
         shell("echo ldap-auth-config ldap-auth-config/ldapns/ldap-server string ldap://{} | sudo debconf-set-selections".format(host))
         shell("echo ldap-auth-config ldap-auth-config/override boolean true | sudo debconf-set-selections")
         shell("echo ldap-auth-config ldap-auth-config/ldapns/ldap_version select 3 | sudo debconf-set-selections")
         shell("echo ldap-auth-config ldap-auth-config/dbrootlogin boolean true | sudo debconf-set-selections")
-        shell("echo ldap-auth-config ldap-auth-config/ldapns/base-dn string dc={},dc={} | sudo debconf-set-selections".format(domin.split("."))
+        shell("echo ldap-auth-config ldap-auth-config/ldapns/base-dn string dc={},dc={} | sudo debconf-set-selections".format(domain.split(".")[0],domain.split(".")[1]))
         shell("echo ldap-auth-config ldap-auth-config/move-to-debconf boolean true | sudo debconf-set-selections")
         shell("echo ldap-auth-config ldap-auth-config/pam_password select clear | sudo debconf-set-selections")