wfau · stvoutsin · Apr 28, 2020 · Jan 21, 2020 · Jan 21, 2020 · Jan 22, 2020
diff --git a/experiments/zrq/ansible/01-create-network.yml b/experiments/zrq/ansible/01-create-network.yml
@@ -0,0 +1,64 @@
+#
+# <meta:header>
+#   <meta:licence>
+#     Copyright (c) 2020, ROE (http://www.roe.ac.uk/)
+#
+#     This information is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     This information is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#   </meta:licence>
+# </meta:header>
+#
+#
+
+- name: "Create our internal network"
+  gather_facts: false
+  hosts: localhost
+  vars_files:
+    - /tmp/ansible-vars.yml
+  tasks:
+
+    - name: "Create our internal network"
+      os_network:
+        cloud: "{{ cloudname }}"
+        state: present
+        name: "{{ networks['internal'] }}"
+        shared:   'no'
+        external: 'no'
+      register:
+        agnetwork
+
+
+    - name: "Create a subnet for our internal network"
+      os_subnet:
+        cloud: "{{ cloudname }}"
+        state: present
+        name: "{{ agnetwork.network.name }}-subnet"
+        network_name: "{{ agnetwork.network.name }}"
+        cidr: 10.10.0.0/16
+      register:
+        agsubnet
+
+
+    - name: "Create a router for our internal network"
+      os_router:
+        cloud: "{{ cloudname }}"
+        state: present
+        name:    "{{ agnetwork.network.name }}-router"
+        network: "{{ networks['external'] }}"
+        interfaces:
+          - net:    "{{ agnetwork.network.name }}"
+            subnet: "{{ agsubnet.subnet.name }}"
+      register:
+        agrouter
+
+
diff --git a/...ts/zrq/ansible/01-create-gateway-node.yml → ...riments/zrq/ansible/02-create-gateway.yml b/...ts/zrq/ansible/01-create-gateway-node.yml → ...riments/zrq/ansible/02-create-gateway.yml
@@ -1,7 +1,7 @@
 #
 # <meta:header>
 #   <meta:licence>
-#     Copyright (c) 2019, ROE (http://www.roe.ac.uk/)
+#     Copyright (c) 2020, ROE (http://www.roe.ac.uk/)
 #
 #     This information is free software: you can redistribute it and/or modify
 #     it under the terms of the GNU General Public License as published by
@@ -20,81 +20,77 @@
 #
 #
 
-- name:  Create our gateway node
+- name: "Create our gateway node"
+  gather_facts: false
   hosts: localhost
-
+  vars_files:
+    - /tmp/ansible-vars.yml
   tasks:
 
-    - name: "Create the '{{ firewalls['gateway'] }}' security group"
+    - name: "Create a security group for our gateway node"
       os_security_group:
-        cloud: cumulus
+        cloud: "{{ cloudname }}"
         state: present
-        name: "{{ firewalls['gateway'] }}"
+        name: "{{ security['gateway'] }}"
       register:
-        security
+        gatewaysec
 
-    - name: Create a security rule for IPv4 SSH
+    - name: "Add a security rule for IPv4 SSH"
       os_security_group_rule:
-        cloud: cumulus
+        cloud: "{{ cloudname }}"
         state: present
-        security_group: "{{ security.id }}"
+        security_group: "{{ gatewaysec.id }}"
         direction: 'ingress'
         protocol:  'tcp'
         ethertype: 'IPv4'
         port_range_min: 22
         port_range_max: 22
         remote_ip_prefix: '0.0.0.0/0'
 
-    - name: Create a security rule for IPv6 SSH
+    - name: "Add a security rule for IPv6 SSH"
       os_security_group_rule:
-        cloud: cumulus
+        cloud: "{{ cloudname }}"
         state: present
-        security_group: "{{ security.id }}"
+        security_group: "{{ gatewaysec.id }}"
         direction: 'ingress'
         protocol:  'tcp'
         ethertype: 'IPv6'
         port_range_min: 22
         port_range_max: 22
         remote_ip_prefix: '::/0'
 
-    - name: Create our gateway node
+    - name: "Create our gateway node"
       os_server:
-        cloud: 'cumulus'
+        cloud: "{{ cloudname }}"
         state: present
-        name:   "{{ hostvars['gateway'].nodename }}"
-        image:  "{{ hostvars['gateway'].image  }}"
-        flavor: "{{ hostvars['gateway'].flavor }}"
-        network:  'cumulus-internal'
-        key_name: 'aglais-ansible'
+        name:     "{{ buildtag }}-gateway"
+        image:    "{{ hostvars['gateway'].image  }}"
+        flavor:   "{{ hostvars['gateway'].flavor }}"
+        network:  "{{ networks['internal'] }}"
+        key_name: "{{ keypair }}"
         auto_ip: no
         meta:
-            hostname: "{{ hostvars['gateway'].nodename }}"
+            hostname: 'gateway'
         security_groups:
-          - "{{ security.id }}"
+          - "{{ gatewaysec.id }}"
       register:
-        instance
+        gatewaynode
 
-    - name: Assign a new floating IP address
+    - name: "Assign a floating IP address to our gateway node"
       os_floating_ip:
-        cloud: 'cumulus'
+        cloud: "{{ cloudname }}"
         state: present
-        server:  '{{ instance.id }}'
-        network: 'internet'
-        nat_destination: 'cumulus-internal'
+        server:  '{{ gatewaynode.id }}'
+        network: "{{ networks['external'] }}"
+        nat_destination: "{{ networks['internal'] }}"
       register:
-        floating
+        gatewayip
 
-    - name: Apply our security group to the floating IP address
+    - name: "Apply the gateway security group to our floating IP address"
       os_port:
+        cloud: "{{ cloudname }}"
         state: present
-        name: '{{ floating.floating_ip.port }}'
+        name: '{{ gatewayip.floating_ip.port }}'
         security_groups:
-          - "{{ security.id }}"
-
-    - debug:
-        var: floating.floating_ip.floating_ip_address
-
-    - set_fact:
-
-
+          - "{{ gatewaysec.id }}"
 
diff --git a/experiments/zrq/ansible/02-create-worker-nodes.yml b/experiments/zrq/ansible/02-create-worker-nodes.yml
diff --git a/experiments/zrq/ansible/03-create-masters.yml b/experiments/zrq/ansible/03-create-masters.yml
@@ -0,0 +1,67 @@
+#
+# <meta:header>
+#   <meta:licence>
+#     Copyright (c) 2020, ROE (http://www.roe.ac.uk/)
+#
+#     This information is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     This information is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#   </meta:licence>
+# </meta:header>
+#
+#
+
+- name: "Create our master nodes"
+  gather_facts: false
+  hosts: localhost
+  vars_files:
+    - /tmp/ansible-vars.yml
+  tasks:
+
+    - name: "Create a security group for our masters"
+      os_security_group:
+        cloud: "{{ cloudname }}"
+        state: present
+        name: "{{ security['masters'] }}"
+      register:
+        mastersec
+
+    - name: "Add a rule to allow SSH from our gateway"
+      os_security_group_rule:
+        cloud: "{{ cloudname }}"
+        state: present
+        security_group: "{{ mastersec.id }}"
+        direction: 'ingress'
+        protocol:  'tcp'
+        port_range_min: 22
+        port_range_max: 22
+        remote_group: "{{ security['gateway'] }}"
+
+    - name: "Create our masters"
+      os_server:
+        cloud: "{{ cloudname }}"
+        state: present
+        name:     "{{ buildtag }}-{{ item }}"
+        image:    "{{ hostvars[item]['image']  }}"
+        flavor:   "{{ hostvars[item]['flavor'] }}"
+        network:  "{{ networks['internal'] }}"
+        key_name: "{{ keypair }}"
+        auto_ip: no
+        meta:
+          "hostname={{ item }}"
+        security_groups:
+          - "{{ mastersec.id }}"
+      loop:
+        "{{ groups['masters'] }}"
+      register:
+        masternodes
+