summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Fenzi <kevin@scrye.com>2017-05-02 17:23:00 +0000
committerKevin Fenzi <kevin@scrye.com>2017-05-02 17:23:00 +0000
commit8cfe569668a2473dc5f5620d41794830e6898289 (patch)
treecf0d06ce41f7b1102eb84e39f2cc8c69d6ab39cf
parent2cb2d0291e0b17815c89396e233a059c47ca72e1 (diff)
downloadansible-8cfe569668a2473dc5f5620d41794830e6898289.tar.gz
ansible-8cfe569668a2473dc5f5620d41794830e6898289.tar.xz
ansible-8cfe569668a2473dc5f5620d41794830e6898289.zip
Make hubs-dev a persistent image.
-rw-r--r--inventory/host_vars/hubs-dev.fedorainfracloud.org18
-rw-r--r--inventory/inventory6
-rw-r--r--master.yml1
-rw-r--r--playbooks/hosts/hubs-dev.fedorainfroacloud.org.yml26
4 files changed, 47 insertions, 4 deletions
diff --git a/inventory/host_vars/hubs-dev.fedorainfracloud.org b/inventory/host_vars/hubs-dev.fedorainfracloud.org
new file mode 100644
index 000000000..21215564e
--- /dev/null
+++ b/inventory/host_vars/hubs-dev.fedorainfracloud.org
@@ -0,0 +1,18 @@
+---
+image: "{{ fedora25_x86_64 }}"
+instance_type: m1.medium
+keypair: fedora-admin-20130801
+security_group: ssh-anywhere-persistent,all-icmp-persistent,default,web-80-anywhere-persistent,web-443-anywhere-persistent
+zone: nova
+tcp_ports: [22, 80, 443]
+
+inventory_tenant: persistent
+inventory_instance_name: hubs-dev
+hostbase: hubs-dev
+public_ip: 209.132.184.47
+root_auth_users: sayan
+description: hubs development instance
+
+cloud_networks:
+ # persistent-net
+ - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
diff --git a/inventory/inventory b/inventory/inventory
index d1271d554..cf74f6c35 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -1089,10 +1089,6 @@ pdc-backend03.stg.phx2.fedoraproject.org
[piwik-stg]
#piwik01.stg.phx2.fedoraproject.org
-[transient-cloud]
-# fedora-hubs-dev
-209.132.184.98
-
[persistent-cloud]
# artboard instance
artboard.fedorainfracloud.org
@@ -1157,6 +1153,8 @@ kolinahr.fedorainfracloud.org
respins.fedorainfracloud.org
# waiverdb-dev - ticket 6009
waiverdb-dev.fedorainfracloud.org
+# hubs-dev
+hubs-dev.fedorainfracloud.org
#
# These are in the new cloud
diff --git a/master.yml b/master.yml
index a468f6447..27bb7e765 100644
--- a/master.yml
+++ b/master.yml
@@ -142,6 +142,7 @@
- include: /srv/web/infra/ansible/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/grafana.cloud.fedoraproject.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/graphite.fedorainfracloud.org.yml
+- include: /srv/web/infra/ansible/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/iddev.fedorainfracloud.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/insim.fedorainfracloud.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
diff --git a/playbooks/hosts/hubs-dev.fedorainfroacloud.org.yml b/playbooks/hosts/hubs-dev.fedorainfroacloud.org.yml
new file mode 100644
index 000000000..dc954d433
--- /dev/null
+++ b/playbooks/hosts/hubs-dev.fedorainfroacloud.org.yml
@@ -0,0 +1,26 @@
+- name: check/create instance
+ hosts: hubs-dev.fedorainfracloud.org
+ gather_facts: False
+
+ vars_files:
+ - /srv/web/infra/ansible/vars/global.yml
+ - /srv/private/ansible/vars.yml
+ - /srv/web/infra/ansible/vars/fedora-cloud.yml
+ - /srv/private/ansible/files/openstack/passwords.yml
+
+ tasks:
+ - include: "{{ tasks_path }}/persistent_cloud.yml"
+
+- name: setup all the things
+ hosts: hubs-dev.fedorainfracloud.org
+ gather_facts: True
+ vars_files:
+ - /srv/web/infra/ansible/vars/global.yml
+ - /srv/private/ansible/vars.yml
+ - /srv/private/ansible/files/openstack/passwords.yml
+ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+
+ pre_tasks:
+ - include: "{{ tasks_path }}/cloud_setup_basic.yml"
+ - name: set hostname (required by some services, at least postfix need it)
+ hostname: name="{{inventory_hostname}}"