generate ansible k8s

deployer/__main__.py

@@ -76,10 +76,10 @@ def handle_delivery(message):
     paths = ansible_service.write_playbooks_from_tosca_interface(interfaces, tmp_path)
     for playbook_path in paths:
         out,err = ansible_service.run(inventory_path,playbook_path)
-        api_key, join_token, discovery_token_ca_cert_hash = ansible_service.parse_tokens(out)
+        api_key, join_token, discovery_token_ca_cert_hash = ansible_service.parse_tokens(out.decode("utf-8"))
 
     ansible_playbook_path = k8s_service.write_ansible_k8s_files(tosca_template_json, tmp_path)
-    out, err = ansible_service.run(inventory_path, playbook_path)
+    out, err = ansible_service.run(inventory_path, ansible_playbook_path)
 
 
     template_dict = {}

deployer/service/ansible_service.py

@@ -71,7 +71,7 @@ def write_inventory_file(tmp_path, vms):
 
 def write_playbooks(tmp_path, interface):
     playbook_paths = []
-    interface_stage_list = ['install','create']
+    interface_stage_list = ['install', 'create']
     # for interface_stage in interface:
     for interface_stage in interface_stage_list:
         playbook_url = interface[interface_stage]['inputs']['playbook']
@@ -92,7 +92,7 @@ def write_playbooks_from_tosca_interface(interfaces, tmp_path):
 
 def run(inventory_path, playbook_path):
     p = Popen(["ansible-playbook", "-i", inventory_path, playbook_path], stdin=PIPE, stdout=PIPE,
-                  stderr=PIPE)
+              stderr=PIPE)
     output, err = p.communicate()
     print(output.decode('utf-8'))
     print(err.decode('utf-8'))
@@ -101,27 +101,31 @@ def run(inventory_path, playbook_path):
 
 
 def parse_tokens(out):
-    api_key = re.search("^msg.*", out)
-    join_token = re.search("^\"stdout\": \"$", out)
-
-    m = re.search('Join command is kubeadm join(.+?)\"', out)
-    if m:
-        found = m.group(1)
-    m = re.search('--token (.+?)     --discovery-token-ca-cert-hash', found)
-    if m:
-        join_token = m.group(1)
-
-    m = re.search('--discovery-token-ca-cert-hash (.+?) "}', out)
-    if m:
-        discovery_token_ca_cert_hash = m.group(1)
-
-    m = re.search('--token (.+?)     --discovery-token-ca-cert-hash', found)
-    if m:
-        join_token = m.group(1)
-
-    m = re.search('"stdout": "      (.+?)",', out)
-    if m:
-        api_key = m.group(1)
+    api_key = None
+    join_token = None
+    discovery_token_ca_cert_hash = None
+    if 'Join command is kubeadm join' in out:
+        api_key = re.search("^msg.*", out)
+        join_token = re.search("^\"stdout\": \"$", out)
+
+        m = re.search('Join command is kubeadm join(.+?)\"', out)
+        if m:
+            found = m.group(1)
+        m = re.search('--token (.+?)     --discovery-token-ca-cert-hash', found)
+        if m:
+            join_token = m.group(1)
+
+        m = re.search('--discovery-token-ca-cert-hash (.+?) "}', out)
+        if m:
+            discovery_token_ca_cert_hash = m.group(1)
+
+        m = re.search('--token (.+?)     --discovery-token-ca-cert-hash', found)
+        if m:
+            join_token = m.group(1)
+
+        m = re.search('"stdout": "      (.+?)",', out)
+        if m:
+            api_key = m.group(1)
     return api_key, join_token, discovery_token_ca_cert_hash
 
 

deployer/service/k8s_service.py

@@ -65,28 +65,30 @@ def write_ansible_k8s_files(tosca_template_json, tmp_path):
     dockers = get_dockers(tosca_template_json)
     k8s_definitions = get_k8s_definitions(dockers)
     services = k8s_definitions['services']
-    deployments  = k8s_definitions['deployments']
+    deployments = k8s_definitions['deployments']
     i = 0
     tasks = []
     for services_def in services:
+        task = {'name': 'Create a Service object' + str(i)}
         k8s = {'state': 'present', 'definition': services_def}
-        task = {'name': 'Create a Service object' + str(i), 'become': 'yes', 'k8s': k8s}
+        task['k8s'] = k8s
         i += 1
         tasks.append(task)
 
     i = 0
-    tasks = []
     for deployments_def in deployments:
-        k8s = {'state': 'present', 'definition': services_def}
-        task = {'name': 'Create a Service object' + str(i), 'become': 'yes', 'k8s': k8s}
+        task = {'name': 'Create a deployment object' + str(i)}
+        k8s = {'state': 'present', 'definition': deployments_def}
+        task['k8s'] = k8s
         i += 1
         tasks.append(task)
 
-    ansible_playbook = {'hosts': 'k8-master', 'tasks': tasks}
+    ansible_playbook = []
+    plays = {'hosts': 'k8-master', 'tasks': tasks}
+    ansible_playbook.append(plays)
     print(yaml.safe_dump(ansible_playbook))
-    ansible_playbook_path = tmp_path+'/'+'k8s_playbook.yml'
-    f = open(ansible_playbook_path, "w")
-    yaml.dump(yaml.safe_dump(ansible_playbook), f)
-    f.close()
+    ansible_playbook_path = tmp_path + '/' + 'k8s_playbook.yml'
 
+    with open(ansible_playbook_path, 'w') as file:
+        documents = yaml.dump(ansible_playbook, file)
     return ansible_playbook_path

drip-deployer/.idea/drip-deployer.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

drip-deployer/.idea/inspectionProfiles/profiles_settings.xml

+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file

drip-deployer/.idea/modules.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/drip-deployer.iml" filepath="$PROJECT_DIR$/.idea/drip-deployer.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file

drip-deployer/.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

drip-deployer/.idea/workspace.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="350a2cb3-d21f-4a78-bd8c-7614f85494cc" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/../deployer/__main__.py" beforeDir="false" afterPath="$PROJECT_DIR$/../deployer/__main__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../deployer/service/ansible_service.py" beforeDir="false" afterPath="$PROJECT_DIR$/../deployer/service/ansible_service.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../deployer/service/k8s_service.py" beforeDir="false" afterPath="$PROJECT_DIR$/../deployer/service/k8s_service.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../provisioner/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../provisioner/pom.xml" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
+  <component name="ProjectId" id="1XDOwMpLrjLoOX7wa6ziawR8wDT" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../deployer" />
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="350a2cb3-d21f-4a78-bd8c-7614f85494cc" name="Default Changelist" comment="" />
+      <created>1580577435383</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1580577435383</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="1043" y="437" width="530" height="598" key="FileChooserDialogImpl" timestamp="1580577475090">
+      <screen x="67" y="34" width="2493" height="1406" />
+    </state>
+    <state x="1043" y="437" width="530" height="598" key="FileChooserDialogImpl/67.34.2493.1406@67.34.2493.1406" timestamp="1580577475090" />
+  </component>
+</project>
\ No newline at end of file

provisioner/nbactions.xml

@@ -15,4 +15,18 @@
                 <jpda.listen>true</jpda.listen>
             </properties>
         </action>
+        <action>
+            <actionName>run</actionName>
+            <packagings>
+                <packaging>jar</packaging>
+            </packagings>
+            <goals>
+                <goal>process-classes</goal>
+                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
+            </goals>
+            <properties>
+                <exec.args>-classpath %classpath nl.uva.sne.drip.provisioner.RPCServer</exec.args>
+                <exec.executable>java</exec.executable>
+            </properties>
+        </action>
     </actions>

provisioner/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>nl.uva.sne.drip</groupId>
-        <artifactId>drip</artifactId>
+        <artifactId>conf</artifactId>
         <version>3.0.0</version>
     </parent>