diff --git a/icgparser/doml/v1/nginx-openstack_v1.domlx b/icgparser/doml/v1/nginx-openstack_v1.domlx index e10fe0e6891f622a91b3b530fe9f82aa4e7e6d03..1b352ff3b631d2a21a9b4d9570f882b60b02a261 100644 --- a/icgparser/doml/v1/nginx-openstack_v1.domlx +++ b/icgparser/doml/v1/nginx-openstack_v1.domlx @@ -7,13 +7,12 @@ </application> <infrastructure name="infra"> <nodes xsi:type="infra:AutoScalingGroup" name="ag" deploymentNetwork="//@infrastructure/@networks.0"> - <machineDefinition name="vm1" os="ubuntu-20.04.3" credentials="//@infrastructure/@credentials.0" group="//@infrastructure/@groups.0" generatedFrom="//@infrastructure/@generators.0"> + <machineDefinition name="vm1" os="Ubuntu-Focal-20.04-Daily-2022-04-19" credentials="//@infrastructure/@credentials.0" group="//@infrastructure/@groups.0"> <ifaces name="i1" endPoint="16.0.0.1" belongsTo="//@infrastructure/@networks.0" associated="//@infrastructure/@groups.0"/> </machineDefinition> </nodes> <networks name="net1" protocol="tcp/ip" addressRange="16.0.0.0/24" connectedIfaces="//@infrastructure/@nodes.0/@machineDefinition/@ifaces.0"/> - <generators xsi:type="infra:VMImage" name="v_img" generatedVMs="//@infrastructure/@nodes.0/@machineDefinition"/> - <credentials xsi:type="infra:KeyPair" name="ssh_key" user="ubuntu" keyfile="/home/user1/.ssh/openstack.key" algorithm="RSA" bits="4096"/> + <credentials xsi:type="infra:KeyPair" name="ssh_key" user="ubuntu"/> <groups xsi:type="infra:SecurityGroup" name="sg" groupedNodes="//@infrastructure/@nodes.0/@machineDefinition" ifaces="//@infrastructure/@nodes.0/@machineDefinition/@ifaces.0"> <rules name="icmp" protocol="icmp" fromPort="-1" toPort="-1"> <cidr>0.0.0.0/0</cidr> @@ -34,11 +33,7 @@ <vms name="concrete_vm" maps="//@infrastructure/@nodes.0/@machineDefinition"> <annotations xsi:type="commons:SProperty" key="vm_name" value="nginx-host"/> <annotations xsi:type="commons:SProperty" key="vm_flavor" value="small"/> - <annotations xsi:type="commons:SProperty" key="vm_key_name" value="user1"/> </vms> - <vmImages name="concrete_vm_image" maps="//@infrastructure/@generators.0"> - <annotations xsi:type="commons:SProperty" key="name" value="ubuntu-20.04.3"/> - </vmImages> <networks name="concrete_net" maps="//@infrastructure/@networks.0"> <annotations xsi:type="commons:SProperty" key="name" value="ostack2"/> </networks> diff --git a/input_file_generated/ir.json b/input_file_generated/ir.json index d5cd04e6a65f89bd5e63e1606e537b5bbc5187d7..da327c87fed30ec8ed80fc98faa55b25629b2a2d 100644 --- a/input_file_generated/ir.json +++ b/input_file_generated/ir.json @@ -50,10 +50,7 @@ ], "credentials": [ { - "algorithm": "RSA", - "bits": 4096, "infra_element_name": "ssh_key", - "keyfile": "/home/user1/.ssh/openstack.key", "user": "ubuntu" } ], @@ -66,17 +63,9 @@ } ], "provider": "openstack", - "vmImages": [ - { - "infra_element_name": "v_img", - "kind": "SCRIPT", - "name": "concrete_vm_image" - } - ], "vms": [ { "credentials": "ssh_key", - "generatedFrom": "v_img", "group": "sg", "i1": { "associated": "sg", @@ -86,9 +75,8 @@ }, "infra_element_name": "vm1", "name": "concrete_vm", - "os": "ubuntu-20.04.3", + "os": "Ubuntu-Focal-20.04-Daily-2022-04-19", "vm_flavor": "small", - "vm_key_name": "user1", "vm_name": "nginx-host" } ] @@ -101,7 +89,6 @@ "name": "nginx", "node": { "credentials": "ssh_key", - "generatedFrom": "v_img", "group": "sg", "i1": { "associated": "sg", @@ -111,9 +98,8 @@ }, "infra_element_name": "vm1", "name": "concrete_vm", - "os": "ubuntu-20.04.3", + "os": "Ubuntu-Focal-20.04-Daily-2022-04-19", "vm_flavor": "small", - "vm_key_name": "user1", "vm_name": "nginx-host" }, "source_code": "/usr/share/nginx/html/index.html" diff --git a/output_files_generated/nginx_openstack/config.yaml b/output_files_generated/nginx_openstack/config.yaml new file mode 100644 index 0000000000000000000000000000000000000000..6464675fc28c7eb4c9e955f4184bf662c8f3f0a5 --- /dev/null +++ b/output_files_generated/nginx_openstack/config.yaml @@ -0,0 +1,5 @@ +--- +iac: +- terraform +- ansible +... \ No newline at end of file