diff --git a/inventory/group_vars/wiki b/inventory/group_vars/wiki index 2ee64c90dc..ccce69a810 100644 --- a/inventory/group_vars/wiki +++ b/inventory/group_vars/wiki @@ -32,7 +32,7 @@ fedmsg_certs: nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3" csi_security_category: Moderate -csi_primary_contact: sysadmin-main admin@fedoraproject.org - IRC #fedora-admin +csi_primary_contact: #fedora-admin csi_purpose: Provides our wiki csi_relationship: | - There are multiple servers that this service requires. All proxy servers and Wiki 1 and 2. diff --git a/inventory/host_vars/glittergallery-dev.fedorainfracloud.org b/inventory/host_vars/glittergallery-dev.fedorainfracloud.org new file mode 100644 index 0000000000..5d982be7d4 --- /dev/null +++ b/inventory/host_vars/glittergallery-dev.fedorainfracloud.org @@ -0,0 +1,18 @@ +--- +image: "{{ fedora21_x86_64 }}" +instance_type: m1.medium +keypair: fedora-admin-20130801 +security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,default,web-443-anywhere-persistent +zone: nova +tcp_ports: [22, 80, 443] + +inventory_tenant: persistent +inventory_instance_name: glittergallery-dev +hostbase: glittergallery-dev +public_ip: 209.132.184.60 +root_auth_users: sonalkr132 sarupbanskota +description: glittergallery GSoC work + +cloud_networks: + # persistent-net + - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" diff --git a/inventory/inventory b/inventory/inventory index 174b835ca6..5a36c94b05 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -956,6 +956,8 @@ taiga.fedorainfracloud.org taigastg.fedorainfracloud.org # graphite/statsd/grafana exploration grafana.cloud.fedoraproject.org +# glittergallery GSoC dev work +glittergallery-dev.fedorainfracloud.org # shumgrepper-dev shumgrepper-dev.fedorainfracloud.org # fas2-dev diff --git a/master.yml b/master.yml index edf5616cd3..9dccf5dd7b 100644 --- a/master.yml +++ b/master.yml @@ -132,6 +132,7 @@ - include: /srv/web/infra/ansible/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/faitout.fedorainfracloud.org.yml +- 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/insim.fedorainfracloud.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/lists-dev.fedorainfracloud.org.yml diff --git a/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml b/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml new file mode 100644 index 0000000000..81dae38c44 --- /dev/null +++ b/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml @@ -0,0 +1,26 @@ +- name: check/create instance + hosts: glittergallery-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 }}/persistent_cloud_new.yml" + +- name: setup all the things + hosts: glittergallery-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 }}/cloud_setup_basic.yml" + - name: set hostname (required by some services, at least postfix need it) + shell: "hostname {{inventory_hostname}}"