Commit cec8da28 authored by Spiros Koulouzis's avatar Spiros Koulouzis

change orchestrator type name

parent b2ee3454
...@@ -144,8 +144,9 @@ if __name__ == "__main__": ...@@ -144,8 +144,9 @@ if __name__ == "__main__":
thread = Thread(target=threaded_function, args=(1,)) thread = Thread(target=threaded_function, args=(1,))
thread.start() thread.start()
start(channel) start(channel)
except: except Exception as e:
done = True done = True
e = sys.exc_info()[0] e = sys.exc_info()[0]
logger.info("Error: " + str(e)) logger.info("Error: " + str(e))
print(e)
exit(-1) exit(-1)
...@@ -95,8 +95,8 @@ def write_playbooks_from_tosca_interface(interfaces, tmp_path): ...@@ -95,8 +95,8 @@ def write_playbooks_from_tosca_interface(interfaces, tmp_path):
def run(inventory_path, playbook_path): def run(inventory_path, playbook_path):
logger.info("Executing playbook: " + str(playbook_path)) logger.info("Executing playbook: " + str(playbook_path))
p = Popen(["ansible-playbook", "-i", inventory_path, playbook_path], stdin=PIPE, stdout=PIPE, p = Popen(["ansible-playbook", "-i", inventory_path, playbook_path,'--ssh-common-args=\'-o '
stderr=PIPE) 'StrictHostKeyChecking=no\''], stdin=PIPE, stdout=PIPE, stderr=PIPE)
output, err = p.communicate() output, err = p.communicate()
# print(output.decode('utf-8')) # print(output.decode('utf-8'))
# print(err.decode('utf-8')) # print(err.decode('utf-8'))
......
...@@ -6,7 +6,7 @@ logger = logging.getLogger(__name__) ...@@ -6,7 +6,7 @@ logger = logging.getLogger(__name__)
def get_interfaces(tosca_template_dict): def get_interfaces(tosca_template_dict):
node_templates = tosca_template_dict['topology_template']['node_templates'] node_templates = tosca_template_dict['topology_template']['node_templates']
for node_name in node_templates: for node_name in node_templates:
if node_templates[node_name]['type'] == 'tosca.nodes.ARTICONF.Orchestrator.Kubernetes': if node_templates[node_name]['type'] == 'tosca.nodes.ARTICONF.docker.Orchestrator.Kubernetes':
logger.info("Returning interfaces from tosca_template: " + str(node_templates[node_name]['interfaces'])) logger.info("Returning interfaces from tosca_template: " + str(node_templates[node_name]['interfaces']))
return node_templates[node_name]['interfaces'] return node_templates[node_name]['interfaces']
......
...@@ -126,13 +126,13 @@ services: ...@@ -126,13 +126,13 @@ services:
RABBITMQ_HOST: rabbit RABBITMQ_HOST: rabbit
SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0 SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
deployer: #deployer:
depends_on: #depends_on:
- rabbit #- rabbit
- sure-tosca #- sure-tosca
image: alogo53/deployer:3.0.0 #image: alogo53/deployer:3.0.0
environment: #environment:
RABBITMQ_HOST: rabbit #RABBITMQ_HOST: rabbit
#volumes: #volumes:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment