add elastic-dev and simple-koji-ci-dev cloud instances

inventory/cloud

@@ -19,6 +19,7 @@ copr-keygen-dev.cloud.fedoraproject.org
 darkserver-dev.fedorainfracloud.org
 developer.fedorainfracloud.org
 eclipse.fedorainfracloud.org
+elastic-dev.fedorainfracloud.org
 el6-test.fedorainfracloud.org
 el7-test.fedorainfracloud.org
 f25-test.fedorainfracloud.org
@@ -60,6 +61,7 @@ jenkins-slave-el7.fedorainfracloud.org
 jenkins-slave-f26.fedorainfracloud.org
 jenkins-slave-f25.fedorainfracloud.org
 jenkins-slave-f25-ppc64le.fedorainfracloud.org
+simple-koji-ci-dev.fedorainfracloud.org
 lists-dev.fedorainfracloud.org
 magazine2.fedorainfracloud.org
 modernpaste.fedorainfracloud.org

inventory/host_vars/elastic-dev.fedorainfracloud.org

@@ -0,0 +1,18 @@
+---
+image: "{{ fedora26_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,all-icmp-persistent
+zone: nova
+tcp_ports: [22, 80, 443]
+
+inventory_tenant: persistent
+inventory_instance_name: elastic-dev
+hostbase: elastic-dev
+public_ip: 209.132.184.196
+root_auth_users: abompard
+description: elastic search development instance
+
+cloud_networks:
+  # persistent-net
+  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"

inventory/host_vars/simple-koji-ci-dev.fedorainfracloud.org

@@ -0,0 +1,18 @@
+---
+image: "{{ fedora26_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,all-icmp-persistent
+zone: nova
+tcp_ports: [22, 80, 443]
+
+inventory_tenant: persistent
+inventory_instance_name: simple-koji-ci-dev
+hostbase: simple-koji-ci-dev
+public_ip: 209.132.184.197
+root_auth_users: pingou
+description: koji simple ci development instance
+
+cloud_networks:
+  # persistent-net
+  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"

inventory/inventory

@@ -1214,6 +1214,10 @@ respins.fedorainfracloud.org
 hubs-dev.fedorainfracloud.org
 # upstreamfirst - ticket 6066
 upstreamfirst.fedorainfracloud.org
+# elastic devel instance - ticket 6479
+elastic-dev.fedorainfracloud.org
+# koji simple ci development - ticket 6419
+simple-koji-ci-dev.fedorainfracloud.org
 
 #
 # These are in the new cloud

master.yml

@@ -129,6 +129,7 @@
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/developer.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/eclipse.fedorainfracloud.org.yml
+- import_playbook: /srv/web/infra/ansible/playbooks/hosts/elastic-dev.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml
 #- import_playbook: /srv/web/infra/ansible/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
@@ -149,6 +150,7 @@
 #- import_playbook: /srv/web/infra/ansible/playbooks/hosts/regcfp2.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/respins.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml
+- import_playbook: /srv/web/infra/ansible/playbooks/hosts/simple-koji-ci-dev.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/taiga.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/taigastg.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/testdays.fedorainfracloud.org.yml

playbooks/hosts/elastic-dev.fedorainfracloud.org.yml

@@ -0,0 +1,34 @@
+- name: check/create instance
+  hosts: elastic-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:
+  - import_tasks: "{{ tasks_path }}/persistent_cloud.yml"
+
+  handlers:
+  - import_tasks: "{{ handlers_path }}/restart_services.yml"
+
+
+- name: setup all the things
+  hosts: elastic-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:
+  - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
+
+  - name: set hostname (required by some services, at least postfix need it)
+    hostname: name="{{inventory_hostname}}"
+
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"

playbooks/hosts/simple-koji-ci-dev.fedorainfracloud.org.yml

@@ -0,0 +1,33 @@
+- name: check/create instance
+  hosts: simple-koji-ci-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:
+  - import_tasks: "{{ tasks_path }}/persistent_cloud.yml"
+
+  handlers:
+  - import_tasks: "{{ handlers_path }}/restart_services.yml"
+
+
+- name: setup all the things
+  hosts: simple-koji-ci-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:
+  - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
+
+  - name: set hostname (required by some services, at least postfix need it)
+    hostname: name="{{inventory_hostname}}"
+
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"