openstack/openstack-ansible
Code Issues Proposed changes

Merge "Use combined pip_install role"

Browse Source
This commit is contained in:
Jenkins 2016-06-07 16:56:43 +00:00 committed by Gerrit Code Review
commit 7907bc0621
17 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/galera-install.yml
View File

@ -63,8 +63,8 @@
max_fail_percentage: 20
user: root
roles:
- role: "pip_lock_down"
when: "(groups['repo_all'] | length) >= 1"
- role: "pip_install"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
- { role: "galera_server", tags: [ "galera-server" ] }
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: galera_log_rotate

1
playbooks/os-aodh-install.yml
View File

@ -95,6 +95,7 @@
- role: "os_aodh"
aodh_venv_tag: "{{ openstack_release }}"
aodh_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/aodh-{{ openstack_release }}.tgz"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-aodh"
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] }

1
playbooks/os-ceilometer-install.yml
View File

@ -102,6 +102,7 @@
- role: "os_ceilometer"
ceilometer_venv_tag: "{{ openstack_release }}"
ceilometer_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/ceilometer-{{ openstack_release }}.tgz"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-ceilometer"
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] }

1
playbooks/os-cinder-install.yml
View File

@ -218,6 +218,7 @@
cinder_management_address: "{{ ansible_ssh_host }}"
cinder_glance_host: "{{ internal_lb_vip_address }}"
cinder_glance_service_port: "{{ glance_service_port }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-cinder"
- role: "ceph_client"

1
playbooks/os-glance-install.yml
View File

@ -151,6 +151,7 @@
- role: "os_glance"
glance_venv_tag: "{{ openstack_release }}"
glance_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/glance-{{ openstack_release }}.tgz"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-glance"
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] }

1
playbooks/os-heat-install.yml
View File

@ -134,6 +134,7 @@
- role: "os_heat"
heat_venv_tag: "{{ openstack_release }}"
heat_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/heat-{{ openstack_release }}.tgz"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-heat"
- role: "rsyslog_client"

1
playbooks/os-horizon-install.yml
View File

@ -108,6 +108,7 @@
horizon_server_name: "{{ container_name }}"
horizon_venv_tag: "{{ openstack_release }}"
horizon_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/horizon-{{ openstack_release }}.tgz"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-horizon"
- role: "rsyslog_client"

1
playbooks/os-ironic-install.yml
View File

@ -110,6 +110,7 @@
- role: "os_ironic"
ironic_venv_tag: "{{ openstack_release }}"
ironic_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/ironic-{{ openstack_release }}.tgz"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-ironic"
- role: "openstack_openrc"

1
playbooks/os-keystone-install.yml
View File

@ -151,6 +151,7 @@
- role: "os_keystone"
keystone_venv_tag: "{{ openstack_release }}"
keystone_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/keystone-{{ openstack_release }}.tgz"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-keystone"
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] }

1
playbooks/os-neutron-install.yml
View File

@ -187,6 +187,7 @@
neutron_local_ip: "{{ _local_ip }}"
neutron_overlay_network: "{{ _overlay_network }}"
neutron_provider_networks: "{{ _provider_networks }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-neutron"
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] }

1
playbooks/os-nova-install.yml
View File

@ -251,6 +251,7 @@
nova_management_address: "{{ management_address }}"
nova_venv_tag: "{{ openstack_release }}"
nova_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/nova-{{ openstack_release }}.tgz"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-nova"
- role: "ceph_client"

1
playbooks/os-swift-install.yml
View File

@ -154,6 +154,7 @@
swift_replication_address: "{{ replication_address }}"
swift_do_setup: True
swift_do_sync: True
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-swift"
vars:

1
playbooks/os-swift-setup.yml
View File

@ -138,6 +138,7 @@
swift_replication_address: "{{ replication_address }}"
swift_do_setup: True
swift_do_sync: False
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-swift"
- role: "rsyslog_client"

1
playbooks/os-swift-sync.yml
View File

@ -24,6 +24,7 @@
swift_do_setup: False
swift_do_sync: True
swift_venv_tag: "{{ openstack_release }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-swift-sync"
vars:

1
playbooks/os-tempest-install.yml
View File

@ -21,6 +21,7 @@
- role: "os_tempest"
tempest_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/tempest-{{ openstack_release }}.tgz"
tempest_git_repo: "{{ openstack_repo_git_url }}/tempest"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- "os-tempest"
- role: "rsyslog_client"

4
playbooks/rabbitmq-install.yml
View File

@ -42,8 +42,8 @@
tags:
- ssh-wait
roles:
- role: "pip_lock_down"
when: "(groups['repo_all'] | length) >= 1"
- role: "pip_install"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
- role: "system_crontab_coordination"
tags:
- "system-crontab-coordination"

5
playbooks/utility-install.yml
View File

@ -72,7 +72,10 @@
- utility-logs
roles:
- { role: "galera_client", tags: [ "utility-galera-client" ] }
- { role: "pip_lock_down", tags: [ "utility-pip-lock-down" ] }
- role: "pip_install"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
tags:
- utility-pip-lock-down
- { role: "openstack_openrc", tags: [ "utility-openstack-openrc" ] }
post_tasks:
- name: Update apt sources