From 810e0a7d32a8c99fcf06fba2f836ac6f200ad821 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Sat, 7 May 2016 12:13:00 -0700 Subject: [PATCH] Use combined pip_install role The pip_install and pip_lock_down roles have been merged. Update playbooks to make use of the merged pip_install role by providing the 'pip_lock_to_internal_repo' variable to based on whether or not 'pip_links' contains any entries. Change-Id: I59ad75ac54fd2c54172b404c53cc2659b9dfe482 --- playbooks/galera-install.yml | 4 ++-- playbooks/os-aodh-install.yml | 1 + playbooks/os-ceilometer-install.yml | 1 + playbooks/os-cinder-install.yml | 1 + playbooks/os-glance-install.yml | 1 + playbooks/os-heat-install.yml | 1 + playbooks/os-horizon-install.yml | 1 + playbooks/os-ironic-install.yml | 1 + playbooks/os-keystone-install.yml | 1 + playbooks/os-neutron-install.yml | 1 + playbooks/os-nova-install.yml | 1 + playbooks/os-swift-install.yml | 1 + playbooks/os-swift-setup.yml | 1 + playbooks/os-swift-sync.yml | 1 + playbooks/os-tempest-install.yml | 1 + playbooks/rabbitmq-install.yml | 4 ++-- playbooks/utility-install.yml | 5 ++++- 17 files changed, 22 insertions(+), 5 deletions(-) diff --git a/playbooks/galera-install.yml b/playbooks/galera-install.yml index c3e856af8b..da77d3eb19 100644 --- a/playbooks/galera-install.yml +++ b/playbooks/galera-install.yml @@ -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 diff --git a/playbooks/os-aodh-install.yml b/playbooks/os-aodh-install.yml index c4145420ea..f3c5aa11c5 100644 --- a/playbooks/os-aodh-install.yml +++ b/playbooks/os-aodh-install.yml @@ -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" ] } diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml index 7f86c434f1..b8105bceec 100644 --- a/playbooks/os-ceilometer-install.yml +++ b/playbooks/os-ceilometer-install.yml @@ -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" ] } diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml index dfeba99a59..01424b31f1 100644 --- a/playbooks/os-cinder-install.yml +++ b/playbooks/os-cinder-install.yml @@ -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" diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml index eff48f3cfb..bff77076b5 100644 --- a/playbooks/os-glance-install.yml +++ b/playbooks/os-glance-install.yml @@ -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" ] } diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml index ea87ca8468..cbd12bc3ae 100644 --- a/playbooks/os-heat-install.yml +++ b/playbooks/os-heat-install.yml @@ -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" diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml index bee5f0605a..e5abbe7a54 100644 --- a/playbooks/os-horizon-install.yml +++ b/playbooks/os-horizon-install.yml @@ -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" diff --git a/playbooks/os-ironic-install.yml b/playbooks/os-ironic-install.yml index 26d278b0fd..3ca4c7f36f 100644 --- a/playbooks/os-ironic-install.yml +++ b/playbooks/os-ironic-install.yml @@ -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" diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml index c9931db384..fe9a135f8e 100644 --- a/playbooks/os-keystone-install.yml +++ b/playbooks/os-keystone-install.yml @@ -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" ] } diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml index 8c9d2cac8d..efbe16f365 100644 --- a/playbooks/os-neutron-install.yml +++ b/playbooks/os-neutron-install.yml @@ -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" ] } diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml index 0ce52ce7a9..d5b408358a 100644 --- a/playbooks/os-nova-install.yml +++ b/playbooks/os-nova-install.yml @@ -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" diff --git a/playbooks/os-swift-install.yml b/playbooks/os-swift-install.yml index 8cd0865a65..09ddc6c6eb 100644 --- a/playbooks/os-swift-install.yml +++ b/playbooks/os-swift-install.yml @@ -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: diff --git a/playbooks/os-swift-setup.yml b/playbooks/os-swift-setup.yml index 4275fbc113..1c560aa254 100644 --- a/playbooks/os-swift-setup.yml +++ b/playbooks/os-swift-setup.yml @@ -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" diff --git a/playbooks/os-swift-sync.yml b/playbooks/os-swift-sync.yml index c7059b753a..7522b1d438 100644 --- a/playbooks/os-swift-sync.yml +++ b/playbooks/os-swift-sync.yml @@ -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: diff --git a/playbooks/os-tempest-install.yml b/playbooks/os-tempest-install.yml index 4b0f200790..e8f0acf392 100644 --- a/playbooks/os-tempest-install.yml +++ b/playbooks/os-tempest-install.yml @@ -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" diff --git a/playbooks/rabbitmq-install.yml b/playbooks/rabbitmq-install.yml index 5fc581dadc..6c47de11c4 100644 --- a/playbooks/rabbitmq-install.yml +++ b/playbooks/rabbitmq-install.yml @@ -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" diff --git a/playbooks/utility-install.yml b/playbooks/utility-install.yml index db7148ce59..a87e362a82 100644 --- a/playbooks/utility-install.yml +++ b/playbooks/utility-install.yml @@ -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