8 files changed, 86 insertions, 5 deletions
diff --git a/inventory/group_vars/mm b/inventory/group_vars/mm
new file mode 100644
index 000000000..ffdcc7353
--- /dev/null
+++ b/inventory/group_vars/mm
@@ -0,0 +1,4 @@
+---
+# Define resources for this group of hosts here. 
+fas_client_groups: sysadmin-noc,sysadmin-web
+sudoers: "{{ private }}/files/sudo/mm2-sudoers"
diff --git a/inventory/host_vars/mm-backend01.phx2.fedoraproject.org b/inventory/host_vars/mm-backend01.phx2.fedoraproject.org
new file mode 100644
index 000000000..ce4f9413f
--- /dev/null
+++ b/inventory/host_vars/mm-backend01.phx2.fedoraproject.org
@@ -0,0 +1,28 @@
+---
+lvm_size: 20000
+mem_size: 4096
+num_cpus: 2
+nm: 255.255.255.0
+gw: 10.5.126.254
+dns: 10.5.126.21
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
+ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
+volgroup: /dev/vg_virthost03
+eth0_ip: 10.5.126.183
+eth1_ip: 10.5.127.23
+vmhost: virthost03.phx2.fedoraproject.org
+datacenter: phx2
+
+# nfs mount options, overrides the all/default
+nfs_mount_opts: "ro,hard,bg,intr,nodev,nosuid"
+
+# We define this here to override the global one because we need eth1
+virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
+                 --vcpus={{ num_cpus }}  -l {{ ks_repo }} -x
+                 "ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
+                  hostname={{ inventory_hostname }} nameserver={{ dns }}
+                  ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none
+                  ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname }}-nfs:eth1:none"
+                 --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio
+                 --autostart --noautoconsole
diff --git a/inventory/host_vars/mm-crawler01.phx2.fedoraproject.org b/inventory/host_vars/mm-crawler01.phx2.fedoraproject.org
new file mode 100644
index 000000000..0f364b8ee
--- /dev/null
+++ b/inventory/host_vars/mm-crawler01.phx2.fedoraproject.org
@@ -0,0 +1,13 @@
+---
+lvm_size: 20000
+mem_size: 32768
+num_cpus: 4
+nm: 255.255.255.0
+gw: 10.5.126.254
+dns: 10.5.126.21
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
+ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
+volgroup: /dev/vg_guests
+eth0_ip: 10.5.126.184
+vmhost: virthost02.phx2.fedoraproject.org
+datacenter: phx2
diff --git a/inventory/host_vars/mm-crawler02.phx2.fedoraproject.org b/inventory/host_vars/mm-crawler02.phx2.fedoraproject.org
new file mode 100644
index 000000000..7a27f7f13
--- /dev/null
+++ b/inventory/host_vars/mm-crawler02.phx2.fedoraproject.org
@@ -0,0 +1,13 @@
+---
+lvm_size: 20000
+mem_size: 32768
+num_cpus: 4
+nm: 255.255.255.0
+gw: 10.5.126.254
+dns: 10.5.126.21
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
+ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
+volgroup: /dev/vg_virthost03
+eth0_ip: 10.5.126.185
+vmhost: virthost03.phx2.fedoraproject.org
+datacenter: phx2
diff --git a/inventory/host_vars/mm-frontend01.phx2.fedoraproject.org b/inventory/host_vars/mm-frontend01.phx2.fedoraproject.org
new file mode 100644
index 000000000..e00b16f51
--- /dev/null
+++ b/inventory/host_vars/mm-frontend01.phx2.fedoraproject.org
@@ -0,0 +1,16 @@
+---
+lvm_size: 20000
+mem_size: 2048
+num_cpus: 1
+nm: 255.255.255.0
+gw: 10.5.126.254
+dns: 10.5.126.21
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
+ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
+volgroup: /dev/vg_guests
+eth0_ip: 10.5.126.182
+vmhost: virthost02.phx2.fedoraproject.org
+datacenter: phx2
+
+tcp_ports: [ 80, 443 ]
+
diff --git a/inventory/inventory b/inventory/inventory
index 7cda23189..14649d3ea 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -360,6 +360,12 @@ mirrorlist-phx2.phx2.fedoraproject.org
 [mirrorlist2-stg]
 mirrorlist-phx2.stg.phx2.fedoraproject.org
 
+[mm]
+mm-frontend01.phx2.fedoraproject.org
+mm-backend01.phx2.fedoraproject.org
+mm-crawler01.phx2.fedoraproject.org
+mm-crawler02.phx2.fedoraproject.org
+
 [mm-stg]
 mm-frontend01.stg.phx2.fedoraproject.org
 mm-backend01.stg.phx2.fedoraproject.org
diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml
index 190d10a17..a58ae875a 100644
--- a/playbooks/groups/mirrormanager.yml
+++ b/playbooks/groups/mirrormanager.yml
@@ -1,5 +1,5 @@
 - name: make the servers
-  hosts: mm-stg
+  hosts: mm:mm-stg
   user: root
   gather_facts: False
 
@@ -15,7 +15,7 @@
   - include: "{{ handlers }}/restart_services.yml"
 
 - name: make the boxe be real for real
-  hosts: mm-stg
+  hosts: mm:mm-stg
   user: root
   gather_facts: True
 
@@ -44,7 +44,7 @@
   - include: "{{ handlers }}/restart_services.yml"
 
 - name: Deploy the backend
-  hosts: mm-backend01.stg.phx2.fedoraproject.org
+  hosts: mm-backend01.phx2.fedoraproject.org:mm-backend01.stg.phx2.fedoraproject.org
   user: root
   gather_facts: True
 
@@ -60,7 +60,7 @@
   - include: "{{ handlers }}/restart_services.yml"
 
 - name: Deploy the crawler
-  hosts: mm-crawler01.stg.phx2.fedoraproject.org
+  hosts: mm-crawler01.phx2.fedoraproject.org:mm-crawler01.stg.phx2.fedoraproject.org
   user: root
   gather_facts: True
 
@@ -76,7 +76,7 @@
   - include: "{{ handlers }}/restart_services.yml"
 
 - name: Deploy the frontend (web-app)
-  hosts: mm-frontend01.stg.phx2.fedoraproject.org
+  hosts: mm-frontend01.phx2.fedoraproject.org:mm-frontend01.stg.phx2.fedoraproject.org
   user: root
   gather_facts: True
 
diff --git a/roles/openvpn/server/files/ccd/mm-frontend01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/mm-frontend01.phx2.fedoraproject.org
new file mode 100644
index 000000000..92aa16542
--- /dev/null
+++ b/roles/openvpn/server/files/ccd/mm-frontend01.phx2.fedoraproject.org
@@ -0,0 +1 @@
+ifconfig-push 192.168.1.141 192.168.1.141