more renaming stuff for migration from qadevel-stg to qa-stg

inventory/group_vars/qa-stg

@@ -19,7 +19,7 @@ virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ me
                   ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none" 
                  --network=bridge=br0,model=virtio --autostart --noautoconsole
 
-sshd_config: ssh/sshd_config.qadevel
+sshd_config: ssh/sshd_config.qa-stg
 external_hostname: qa.stg.fedoraproject.org
 
 sslcertfile: qa-stg01.qa.fedoraproject.org.cert
@@ -27,19 +27,19 @@ sslkeyfile: qa-stg01.qa.fedoraproject.org.key
 
 mariadb_host: localhost
 mariadb_config: my.cnf.phabricator
-mariadb_user: '{{ qadevel_stg_mariadb_user }}'
-mariadb_password: '{{ qadevel_stg_mariadb_password }}'
+mariadb_user: '{{ qa_stg_mariadb_user }}'
+mariadb_password: '{{ qa_stg_mariadb_password }}'
 
 # phabricator config
 phabricator_db_prefix: 'phabricatorstg'
 enable_phabricator_git: True
 phabricator_vcs_user: git
-phabricator_vcs_user_password: '{{ qadevel_stg_vcs_user_password }}'
+phabricator_vcs_user_password: '{{ qa_stg_vcs_user_password }}'
 phabricator_daemon_user: phabdaemon
 phabroot: /usr/share/
 phabricator_filedir: /var/lib/phabricator/files
 phabricator_repodir: /var/lib/phabricator/repos
-phabricator_config_filename: qadevelconfig
+phabricator_config_filename: qaconfig
 phabricator_header_color: 'fluttershy'
 phabricator_mail_enabled: True
 phabricator_mail_domain: stg.fedoraproject.org
@@ -63,16 +63,16 @@ master_dir: /home/buildmaster/master
 master_user: buildmaster
 
 # build details
-repo_base: 'https://phab.qadevel.stg.fedoraproject.org/diffusion'
+repo_base: 'https://phab.qa.stg.fedoraproject.org/diffusion'
 docs_build_dir: /var/www/docs/
 
 # for now, we're just doing a local slave so we need the slave vars in here
 slave_home: /home/buildslave/
 slave_dir: /home/buildslave/slave
 slave_user: buildslave
-buildslave_name: 'qadevel-stg'
+buildslave_name: 'qa-stg01'
 
-deployment_type: qadevel-stg
+deployment_type: qa-stg
 tcp_ports: [ 80, 222, 443, "{{ buildslave_port }}", 3306 ]
 
 # static sites

inventory/host_vars/qa-stg01.qa.fedoraproject.org

@@ -11,7 +11,7 @@ datacenter: phx2
 fas_client_groups: sysadmin-qa,sysadmin-main
 
 
-mariadb_root_password: "{{ qadevel_stg_mariadb_root_password }}"
+mariadb_root_password: "{{ qa_stg_mariadb_root_password }}"
 
 public_hostname: qa.stg.fedoraproject.org
 buildmaster: 10.5.124.230

master.yml

@@ -79,7 +79,7 @@
 - include: /srv/web/infra/ansible/playbooks/groups/postgresql-server.yml
 - include: /srv/web/infra/ansible/playbooks/groups/proxies.yml
 - include: /srv/web/infra/ansible/playbooks/groups/qadevel.yml
-#- include: /srv/web/infra/ansible/playbooks/groups/qadevel-stg.yml
+#- include: /srv/web/infra/ansible/playbooks/groups/qa-stg.yml
 - include: /srv/web/infra/ansible/playbooks/groups/resultsdb-prod.yml
 - include: /srv/web/infra/ansible/playbooks/groups/resultsdb-dev.yml
 - include: /srv/web/infra/ansible/playbooks/groups/resultsdb-stg.yml

roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2

@@ -18,8 +18,8 @@ from buildbot.buildslave import openstack
 
 c['slaves'] = [
                 {% for buildslave in buildslaves %}
-                {% if deployment_type == 'qadevel-stg' %}
-                BuildSlave("{{ buildslave }}", "{{ qadevel_stg_buildslave_password }}"),
+                {% if deployment_type == 'qa-stg' %}
+                BuildSlave("{{ buildslave }}", "{{ qa_stg_buildslave_password }}"),
                 {% endif %}
                 {% if deployment_type == 'qadevel-prod' %}
                 BuildSlave("{{ buildslave }}", "{{ qadevel_prod_buildslave_password }}"),
@@ -30,8 +30,8 @@ c['slaves'] = [
 {% if deployment_type == 'qadevel-prod' %}
 c['slaves'].append(
                     openstack.OpenStackLatentBuildSlave(
-                        "{{ qadevel_stg_buildslave_user }}",
-                        "{{ qadevel_stg_buildslave_password }}",
+                        "{{ qadevel_prod_buildslave_user }}",
+                        "{{ qadevel_prod_buildslave_password }}",
                         flavor=3,
                         image="5345b501-9264-4198-a185-eb5a2282fed0",
                         os_username="{{ taskotron_openstack_username }}",
@@ -131,7 +131,7 @@ c['schedulers'].append(ForceScheduler(
                             name="openstack-force",
                             builderNames=["openstack-builder"]))
 {% endif %}
-{% if deployment_type == 'qadevel-stg' %}
+{% if deployment_type == 'qa-stg' %}
 c['schedulers'].append(SingleBranchScheduler(
                             name="libtaskotron",
                             builderNames=['libtaskotron-builder'],
@@ -175,7 +175,7 @@ resultsdb_api_factory = create_test_factory('resultsdb_api')
 fake_fedorainfra_factory = create_test_factory('fake_fedorainfra')
 {% endif %}
 
-{% if deployment_type == 'qadevel-stg' %}
+{% if deployment_type == 'qa-stg' %}
 def create_test_factory(repo_name, func=True):
     factory = BuildFactory()
     factory.addStep(Git(repourl=Interpolate('{{ repo_base }}/%s.git' % repo_name),
@@ -216,11 +216,11 @@ c['builders'].append(
 
 c['builders'].append(
     BuilderConfig(name="openstack-builder",
-      slavenames=["{{ qadevel_stg_buildslave_user }}"],
+      slavenames=["{{ qa_stg_buildslave_user }}"],
       factory=trigger_factory))
 {% endif %}
 
-{% if deployment_type == 'qadevel-stg' %}
+{% if deployment_type == 'qa-stg' %}
 c['builders'].append(
     BuilderConfig(name="libtaskotron-builder",
       slavenames=[{% for buildslave in buildslaves %}"{{ buildslave }}",{% endfor %}],
@@ -241,8 +241,8 @@ from buildbot.status.web import authz, auth
 authz_cfg=authz.Authz(
     # change any of these to True to enable; see the manual for more
     # options
-    {% if deployment_type == 'qadevel-stg' %}
-    auth=auth.BasicAuth([("{{ qadevel_stg_buildbot_master_user }}","{{ qadevel_stg_buildbot_master_password }}")]),
+    {% if deployment_type == 'qa-stg' %}
+    auth=auth.BasicAuth([("{{ qa_stg_buildbot_master_user }}","{{ qa_stg_buildbot_master_password }}")]),
     {% endif %}
     {% if deployment_type == 'qadevel-prod' %}
     auth=auth.BasicAuth([("{{ qadevel_prod_buildbot_master_user }}","{{ qadevel_prod_buildbot_master_password }}")]),

roles/taskotron/buildmaster/tasks/main.yml

@@ -8,7 +8,7 @@
 
 - name: ensure packages required for buildmaster are installed
   action: yum name={{ item }} state=latest
-  when: deployment_type == 'qadevel-prod' or deployment_type == 'qadevel-stg'
+  when: deployment_type == 'qadevel-prod' or deployment_type == 'qa-stg'
   with_items:
     - python-novaclient
 

roles/taskotron/buildslave-configure/templates/buildbot.tac.j2

@@ -46,8 +46,8 @@ passwd = '{{ local_buildslave_password }}'
 {% if deployment_type == 'qadevel-prod' %}
 passwd = '{{ qadevel_prod_buildslave_password }}'
 {% endif %}
-{% if deployment_type == 'qadevel-stg' %}
-passwd = '{{ qadevel_stg_buildslave_password }}'
+{% if deployment_type == 'qa-stg' %}
+passwd = '{{ qa_stg_buildslave_password }}'
 {% endif %}
 
 keepalive = 600