openstack/openstack-ansible
Code Issues Proposed changes

Merge "Revert role pins in master branch"

Browse Source
This commit is contained in:
Jenkins 2017-02-10 08:59:18 +00:00 committed by Gerrit Code Review
commit a80cc45431
6 changed files with 53 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
ansible-role-requirements.yml
View File

@ -1,188 +1,188 @@
- name: apt_package_pinning - name: apt_package_pinning
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
version: 4181e62d539f33c90e3276c0c6ebf6ce6f71c8c8 version: master
- name: pip_install - name: pip_install
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-pip_install src: https://git.openstack.org/openstack/openstack-ansible-pip_install
version: 786b5b637e49fefe36fb5d317bc644afad89a165 version: master
- name: galera_client - name: galera_client
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-galera_client src: https://git.openstack.org/openstack/openstack-ansible-galera_client
version: b2f4deb2ed0e9dd79d615cf49a5c3e09cdf44c9f version: master
- name: galera_server - name: galera_server
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-galera_server src: https://git.openstack.org/openstack/openstack-ansible-galera_server
version: 30c73621fa33cf9cb59d6dc5b572b999cd35d556 version: master
- name: ceph_client - name: ceph_client
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-ceph_client src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
version: 722a84eb7adaada62cb8c0a6cfae42a499b0f665 version: master
- name: haproxy_server - name: haproxy_server
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
version: 8ae4e7b6b962c4d31e9edd995753db0a283d117b version: master
- name: keepalived - name: keepalived
scm: git scm: git
src: https://github.com/evrardjp/ansible-keepalived src: https://github.com/evrardjp/ansible-keepalived
version: 2.4.0 version: master
- name: lxc_container_create - name: lxc_container_create
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
version: d9970fdeba081a2de97db994fca1e1ef86207ee3 version: master
- name: lxc_hosts - name: lxc_hosts
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
version: 746989b07109cb880d4f3ef51e8ee47a394da4ee version: master
- name: memcached_server - name: memcached_server
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-memcached_server src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
version: 5f0defd39bb723f3b6124c9f4fa15387e6f474e1 version: master
- name: openstack-ansible-security - name: openstack-ansible-security
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-security src: https://git.openstack.org/openstack/openstack-ansible-security
version: 91a5c64c8e6330176ab1d86cf4e167a112d77222 version: master
- name: openstack_hosts - name: openstack_hosts
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
version: 86c83d08d0658c17f13d3e1af0b3ac8ec1336066 version: master
- name: os_keystone - name: os_keystone
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_keystone src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
version: 041445954672d4a4a433950f08f7e33d5a3df521 version: master
- name: openstack_openrc - name: openstack_openrc
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
version: a19a049381370d935d58dea2d8a6eaf500437268 version: master
- name: os_aodh - name: os_aodh
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_aodh src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
version: 6972fe39dc2f38e3e6406b96010dffa302cf5dcc version: master
- name: os_barbican - name: os_barbican
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_barbican src: https://git.openstack.org/openstack/openstack-ansible-os_barbican
version: a347dcb333080de7d96931be633ce65be2d30336 version: master
- name: os_ceilometer - name: os_ceilometer
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
version: 7e5d4c84cb36b9c0fa096b0f4c1065d10daac82b version: master
- name: os_cinder - name: os_cinder
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_cinder src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
version: 492e2394d4d23e77d80b7dd5d96ec8f28d56746d version: master
- name: os_glance - name: os_glance
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_glance src: https://git.openstack.org/openstack/openstack-ansible-os_glance
version: 35a848c0dabe41bdb712fb30a6a50fe34c4ab103 version: master
- name: os_gnocchi - name: os_gnocchi
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
version: 219889c69d781ab12ebc307d0083d1cf576197bf version: master
- name: os_heat - name: os_heat
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_heat src: https://git.openstack.org/openstack/openstack-ansible-os_heat
version: 43b276613f16b946386055caef1289a9652d7d37 version: master
- name: os_horizon - name: os_horizon
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_horizon src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
version: 3b65d22667a0d46e3504342550f178ff0e4cdb47 version: master
- name: os_ironic - name: os_ironic
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_ironic src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
version: 00acb09367dabc6b18f5c68040a967eaf21e1223 version: master
- name: os_magnum - name: os_magnum
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_magnum src: https://git.openstack.org/openstack/openstack-ansible-os_magnum
version: 5f574a6107e4f0e7e080de99647e9b5594374c7f version: master
- name: os_trove - name: os_trove
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_trove src: https://git.openstack.org/openstack/openstack-ansible-os_trove
version: 17ce2cd1fe6da6ba163b3637e6a949d77caabcf4 version: master
- name: os_neutron - name: os_neutron
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_neutron src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
version: db71e71c9762f811b22d85e4aee4cd764f030310 version: master
- name: os_nova - name: os_nova
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_nova src: https://git.openstack.org/openstack/openstack-ansible-os_nova
version: 966ea269c9acb88052aca8982c37e0ba8a94a207 version: master
- name: os_rally - name: os_rally
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_rally src: https://git.openstack.org/openstack/openstack-ansible-os_rally
version: dc9dd4f7720c7750e130bf795133bc1c7326b39a version: master
- name: os_sahara - name: os_sahara
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_sahara src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
version: 68ddfa4d80f2f1d0d1e412923e4c123370ee0382 version: master
- name: os_swift - name: os_swift
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_swift src: https://git.openstack.org/openstack/openstack-ansible-os_swift
version: 195621208a9a63106ff52b50ebfefbb2caa1bba1 version: master
- name: os_tempest - name: os_tempest
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_tempest src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
version: d57237c8aeb7c4af833f4d27e3af9a5537a085c2 version: master
- name: plugins - name: plugins
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-plugins src: https://git.openstack.org/openstack/openstack-ansible-plugins
version: 83df10025aa75b1580527fef650ba7639085b59d version: master
- name: rabbitmq_server - name: rabbitmq_server
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
version: 9c09b4a0658d3d25593eaa65f30db8fd3395e5f8 version: master
- name: repo_build - name: repo_build
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-repo_build src: https://git.openstack.org/openstack/openstack-ansible-repo_build
version: 1d0493b58ae06bf0167d1bf4dc90f274a796c80a version: master
- name: repo_server - name: repo_server
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-repo_server src: https://git.openstack.org/openstack/openstack-ansible-repo_server
version: 9c8a51c8d0ee6ecafaa6471ce2d4acf41023fb9d version: master
- name: rsyslog_client - name: rsyslog_client
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
version: 0dbf44a894792a3db5bcca9e0c5fb1207a4bfbc4 version: master
- name: rsyslog_server - name: rsyslog_server
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
version: 3ca2f1e7b0d6b4935f2565586b9674247dcdaa0b version: master
- name: sshd - name: sshd
scm: git scm: git
src: https://github.com/willshersystems/ansible-sshd src: https://github.com/willshersystems/ansible-sshd
version: 0.4.5 version: master
- name: bird - name: bird
scm: git scm: git
src: https://github.com/logan2211/ansible-bird src: https://github.com/logan2211/ansible-bird
version: '1.2' version: master
- name: etcd - name: etcd
scm: git scm: git
src: https://github.com/logan2211/ansible-etcd src: https://github.com/logan2211/ansible-etcd
version: '1.2' version: master
- name: unbound - name: unbound
scm: git scm: git
src: https://github.com/logan2211/ansible-unbound src: https://github.com/logan2211/ansible-unbound
version: '1.1' version: master
- name: resolvconf - name: resolvconf
scm: git scm: git
src: https://github.com/logan2211/ansible-resolvconf src: https://github.com/logan2211/ansible-resolvconf
version: '1.2' version: master
- name: os_designate - name: os_designate
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_designate src: https://git.openstack.org/openstack/openstack-ansible-os_designate
version: 5ba88401eb586fb0aab1c7634da7a88ce98551ff version: master
- name: ceph.ceph-common - name: ceph.ceph-common
scm: git scm: git
src: https://github.com/ceph/ansible-ceph-common src: https://github.com/ceph/ansible-ceph-common
version: v2.1.6 version: master
- name: ceph.ceph-docker-common - name: ceph.ceph-docker-common
scm: git scm: git
src: https://github.com/ceph/ansible-ceph-docker-common src: https://github.com/ceph/ansible-ceph-docker-common
version: ca86fd0ef6d24aa2c750a625acdcb8012c374aa0 version: master
- name: ceph-mon - name: ceph-mon
scm: git scm: git
src: https://github.com/ceph/ansible-ceph-mon src: https://github.com/ceph/ansible-ceph-mon
version: v2.1.6 version: master
- name: ceph-osd - name: ceph-osd
scm: git scm: git
src: https://github.com/ceph/ansible-ceph-osd src: https://github.com/ceph/ansible-ceph-osd
version: v2.1.6 version: master

1
etc/openstack_deploy/user_secrets.yml
View File

@ -144,6 +144,5 @@ barbican_service_password:
## Designate Options ## Designate Options
designate_galera_password: designate_galera_password:
designate_pool_manager_galera_password:
designate_rabbitmq_password: designate_rabbitmq_password:
designate_service_password: designate_service_password:

8
playbooks/inventory/env.d/designate.yml
View File

@ -23,10 +23,10 @@ component_skel:
designate_mdns: designate_mdns:
belongs_to: belongs_to:
- designate_all - designate_all
designate_pool_manager: designate_worker:
belongs_to: belongs_to:
- designate_all - designate_all
designate_zone_manager: designate_producer:
belongs_to: belongs_to:
- designate_all - designate_all
designate_sink: designate_sink:
@ -41,8 +41,8 @@ container_skel:
- designate_api - designate_api
- designate_central - designate_central
- designate_mdns - designate_mdns
- designate_pool_manager - designate_worker
- designate_zone_manager - designate_producer
- designate_sink - designate_sink
properties: properties:
service_name: designate service_name: designate

3
playbooks/inventory/group_vars/designate_all.yml
View File

@ -24,9 +24,6 @@ designate_service_region: "{{ service_region }}"
designate_galera_address: "{{ galera_address }}" designate_galera_address: "{{ galera_address }}"
designate_galera_user: designate designate_galera_user: designate
designate_galera_database_name: designate designate_galera_database_name: designate
designate_pool_manager_galera_user: designate_pool_manager
designate_pool_manager_galera_address: "{{ galera_address }}"
designate_pool_manager_galera_database_name: designate_pool_manager
# RPC # RPC
designate_rabbitmq_userid: designate designate_rabbitmq_userid: designate

8
playbooks/os-designate-install.yml
View File

@ -58,14 +58,6 @@
login_host: "{{ designate_galera_address }}" login_host: "{{ designate_galera_address }}"
db_name: "{{ designate_galera_database_name }}" db_name: "{{ designate_galera_database_name }}"
when: inventory_hostname == groups['designate_all'][0] when: inventory_hostname == groups['designate_all'][0]
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ designate_pool_manager_galera_user }}"
password: "{{ designate_pool_manager_galera_password }}"
login_host: "{{ designate_pool_manager_galera_address }}"
db_name: "{{ designate_pool_manager_galera_database_name }}"
when: inventory_hostname == groups['designate_all'][0]
- include: common-tasks/package-cache-proxy.yml - include: common-tasks/package-cache-proxy.yml
roles: roles:
- role: "os_designate" - role: "os_designate"

4
tests/test_inventory.py
View File

@ -190,8 +190,8 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
'designate_api', 'designate_api',
'designate_central', 'designate_central',
'designate_mdns', 'designate_mdns',
'designate_pool_manager', 'designate_worker',
'designate_zone_manager', 'designate_producer',
'designate_sink', 'designate_sink',
'galera', 'galera',
'galera_all', 'galera_all',