Merge "Initial OSA zuul v3 role jobs" into stable/ocata

doc/source/conf.py

@@ -70,7 +70,9 @@ target_name = 'openstack-ansible-' + role_name
 title = 'OpenStack-Ansible Documentation: ' + role_name + 'role'
 
 # The link to the browsable source code (for the left hand menu)
-oslosphinx_cgit_link = 'http://git.openstack.org/cgit/openstack/' + target_name
+oslosphinx_cgit_link = (
+    "https://git.openstack.org/cgit/openstack/{}".format(target_name)
+)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

releasenotes/source/conf.py

@@ -65,7 +65,9 @@ target_name = 'openstack-ansible-' + role_name
 title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role'
 
 # The link to the browsable source code (for the left hand menu)
-oslosphinx_cgit_link = 'http://git.openstack.org/cgit/openstack/' + target_name
+oslosphinx_cgit_link = (
+    "https://git.openstack.org/cgit/openstack/{}".format(target_name)
+)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

tests/gnocchi_inventory

@@ -1,58 +0,0 @@
-[all]
-localhost ansible_become=True
-infra1 ansible_host=10.1.0.2 ansible_become=True ansible_user=root
-ceilometer ansible_host=10.1.0.3 ansible_become=True ansible_user=root
-gnocchi ansible_host=10.1.0.4 ansible_become=True ansible_user=root
-
-[all_containers]
-infra1
-ceilometer
-gnocchi
-
-[rabbitmq_all]
-infra1
-
-[galera_all]
-infra1
-
-[memcached_all]
-infra1
-
-[service_all:children]
-rabbitmq_all
-galera_all
-memcached_all
-
-[utility_all]
-infra1
-
-[keystone_all]
-infra1
-
-[glance_all]
-infra1
-
-[ceilometer_api]
-ceilometer
-
-[ceilometer_collector]
-ceilometer
-
-[ceilometer_agent_central]
-ceilometer
-
-[ceilometer_agent_notification]
-ceilometer
-
-[ceilometer_agent_compute]
-ceilometer
-
-[ceilometer_all:children]
-ceilometer_api
-ceilometer_collector
-ceilometer_agent_central
-ceilometer_agent_notification
-ceilometer_agent_compute
-
-[gnocchi_all]
-gnocchi

tests/os_ceilometer-gnocchi-overrides.yml

@@ -1,60 +0,0 @@
----
-# Copyright 2016, Comcast Corp
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ceilometer_service_publicuri: "http://{{ hostvars[groups['ceilometer_all'][0]]['ansible_host'] }}:8777"
-ceilometer_service_publicurl: "{{ ceilometer_service_publicuri }}"
-ceilometer_service_internaluri: "http://{{ hostvars[groups['ceilometer_all'][0]]['ansible_host'] }}:8777"
-ceilometer_service_internalurl: "{{ ceilometer_service_internaluri }}"
-ceilometer_service_adminuri: "http://{{ hostvars[groups['ceilometer_all'][0]]['ansible_host'] }}:8777"
-ceilometer_service_adminurl: "{{ ceilometer_service_adminuri }}"
-ceilometer_rabbitmq_userid: ceilometer
-ceilometer_rabbitmq_password: "{{ rabbitmq_password }}"
-ceilometer_rabbitmq_vhost: /ceilometer
-ceilometer_rabbitmq_servers: "{{ rabbitmq_servers }}"
-ceilometer_venv_tag: "testing"
-ceilometer_developer_mode: True
-ceilometer_git_install_branch: stable/ocata
-ceilometer_service_password: secrete
-ceilometer_telemetry_secret: secrete
-ceilometer_gnocchi_enabled: True
-# This is only needed so ceilometer_connection_string can be constructed
-# however, that var should not be needed when using gnocchi for metrics storage
-ceilometer_container_db_password: "secrete"
-
-# Tempest testing relies on glance notifications
-glance_ceilometer_enabled: True
-glance_rabbitmq_telemetry_host_group: rabbitmq_all
-glance_rabbitmq_telemetry_userid: glance
-glance_rabbitmq_telemetry_password: "{{ rabbitmq_password }}"
-glance_rabbitmq_telemetry_port: "{{ rabbitmq_port }}"
-glance_rabbitmq_telemetry_vhost: "/glance"
-
-# Used by the ceilometer role
-swift_system_user_name: swift
-swift_system_shell: /bin/false
-swift_system_comment: swift test user
-swift_system_home_folder: "/var/lib/{{ swift_system_user_name }}"
-
-tempest_run: yes
-tempest_venv_tag: "{{ tempest_git_install_branch }}"
-tempest_venv_bin: "/opt/tempest_{{ tempest_venv_tag }}/bin"
-
-tempest_plugins:
-  - name: tempest-ceilometer
-    repo: https://git.openstack.org/openstack/ceilometer
-    branch: stable/ocata
-
-tempest_test_whitelist:
-  - ceilometer.tests.tempest.api.test_telemetry_notification_api

zuul.d/project.yaml

@@ -0,0 +1,26 @@
+---
+# Copyright 2017, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- project:
+    name: openstack/openstack-ansible-os_ceilometer
+    check:
+      jobs:
+        - openstack-ansible-linters
+        - openstack-ansible-functional-centos-7-nv
+        - openstack-ansible-functional-ubuntu-xenial
+    gate:
+      jobs:
+        - openstack-ansible-linters
+        - openstack-ansible-functional-ubuntu-xenial