diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-30 03:19:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-30 03:19:07 +0000 |
| commit | e2a55c3a027f354b5a29b1439030e7299c308927 (patch) | |
| tree | e5f1865f84845674d112dfa2222c6c17ad26ce74 /ansible | |
| parent | 6c4d06ed8f48a4ab8de95dec91fca7783849b8b9 (diff) | |
| parent | 1ce1cd10fe867d002b0e87013e236842c4af68a6 (diff) | |
| download | kolla-e2a55c3a027f354b5a29b1439030e7299c308927.tar.gz kolla-e2a55c3a027f354b5a29b1439030e7299c308927.zip | |
Merge "Enable the nova microversion api"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/nova/defaults/main.yml | 10 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/register.yml | 15 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/upgrade.yml | 2 |
3 files changed, 18 insertions, 9 deletions
diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml index 08a440e29..2d80abf33 100644 --- a/ansible/roles/nova/defaults/main.yml +++ b/ansible/roles/nova/defaults/main.yml @@ -71,9 +71,13 @@ nova_compute_ironic_image_full: "{{ nova_compute_ironic_image }}:{{ nova_compute #################### # OpenStack #################### -nova_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ nova_api_port }}/v2/%(tenant_id)s" -nova_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ nova_api_port }}/v2/%(tenant_id)s" -nova_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ nova_api_port }}/v2/%(tenant_id)s" +nova_legacy_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ nova_api_port }}/v2/%(tenant_id)s" +nova_legacy_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ nova_api_port }}/v2/%(tenant_id)s" +nova_legacy_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ nova_api_port }}/v2/%(tenant_id)s" + +nova_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ nova_api_port }}/v2.1/%(tenant_id)s" +nova_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ nova_api_port }}/v2.1/%(tenant_id)s" +nova_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ nova_api_port }}/v2.1/%(tenant_id)s" nova_logging_debug: "{{ openstack_logging_debug }}" diff --git a/ansible/roles/nova/tasks/register.yml b/ansible/roles/nova/tasks/register.yml index 5e2184956..a1b87e5c1 100644 --- a/ansible/roles/nova/tasks/register.yml +++ b/ansible/roles/nova/tasks/register.yml @@ -2,9 +2,9 @@ - name: Creating the Nova service and endpoint command: docker exec -t kolla_toolbox /usr/bin/ansible localhost -m kolla_keystone_service - -a "service_name=nova - service_type=compute - description='Openstack Compute' + -a "service_name={{ item.name }} + service_type={{ item.service_type }} + description='{{ item.description }}' endpoint_region={{ openstack_region_name }} url='{{ item.url }}' interface='{{ item.interface }}' @@ -18,9 +18,12 @@ delay: 5 run_once: True with_items: - - {'interface': 'admin', 'url': '{{ nova_admin_endpoint }}'} - - {'interface': 'internal', 'url': '{{ nova_internal_endpoint }}'} - - {'interface': 'public', 'url': '{{ nova_public_endpoint }}'} + - {'name': 'nova_legacy', 'service_type': 'compute_legacy', 'interface': 'admin', 'url': '{{ nova_legacy_admin_endpoint }}', 'description': 'OpenStack Compute Service (Legacy 2.0)'} + - {'name': 'nova_legacy', 'service_type': 'compute_legacy', 'interface': 'internal', 'url': '{{ nova_legacy_internal_endpoint }}', 'description': 'OpenStack Compute Service (Legacy 2.0)'} + - {'name': 'nova_legacy', 'service_type': 'compute_legacy', 'interface': 'public', 'url': '{{ nova_legacy_public_endpoint }}', 'description': 'OpenStack Compute Service (Legacy 2.0)'} + - {'name': 'nova', 'service_type': 'compute', 'interface': 'admin', 'url': '{{ nova_admin_endpoint }}', 'description': 'OpenStack Compute Service'} + - {'name': 'nova', 'service_type': 'compute', 'interface': 'internal', 'url': '{{ nova_internal_endpoint }}', 'description': 'OpenStack Compute Service'} + - {'name': 'nova', 'service_type': 'compute', 'interface': 'public', 'url': '{{ nova_public_endpoint }}', 'description': 'OpenStack Compute Service'} - name: Creating the Nova project, user, and role command: docker exec -t kolla_toolbox /usr/bin/ansible localhost diff --git a/ansible/roles/nova/tasks/upgrade.yml b/ansible/roles/nova/tasks/upgrade.yml index f8f2f7dee..2e7cb4a02 100644 --- a/ansible/roles/nova/tasks/upgrade.yml +++ b/ansible/roles/nova/tasks/upgrade.yml @@ -8,6 +8,8 @@ - include: bootstrap_service.yml +- include: register.yml + - name: Checking if conductor container needs upgrading kolla_docker: action: "compare_image" |