openstack
/
openstack-ansible
Code Issues Proposed changes

Update variable scopes 

Trove depends on those definitions, and we should probably
use those same definitions inside haproxy configuration.

We should therefore move them to all, else the translation build
would fail.

Change-Id: I20d1335c32d204fc41c5f5920c89a3d7e283cd56
This commit is contained in:
Jean-Philippe Evrard 2017-11-28 16:59:19 +00:00
parent 03a57d6668
commit 0baa0f4eae
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
group_vars/all/cinder.yml
View File

@ -15,3 +15,4 @@
# Consumed by the Nova role so it must remain in the 'all' scoped vars
cinder_ceph_client: cinder
cinder_service_port: 8776

5
group_vars/all/keystone.yml
View File

@ -32,3 +32,8 @@ keystone_service_internaluri_proto: "{{ openstack_service_internaluri_proto | de
keystone_service_internaluri_insecure: "{% if keystone_service_internaluri_proto == 'https' and (keystone_user_ssl_cert is not defined or haproxy_user_ssl_cert is not defined) | bool %}true{% else %}false{% endif %}"
keystone_service_internaluri: "{{ keystone_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ keystone_service_port }}"
keystone_service_internalurl: "{{ keystone_service_internaluri }}/v3"
keystone_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(keystone_service_proto) }}"
keystone_service_publicuri_insecure: "{% if keystone_service_publicuri_proto == 'https' and (keystone_user_ssl_cert is not defined or haproxy_user_ssl_cert is not defined) | bool %}true{% else %}false{% endif %}"
keystone_service_publicuri: "{{ keystone_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ keystone_service_port }}"
keystone_service_publicurl: "{{ keystone_service_publicuri }}/v3"

1
group_vars/all/nova.yml
View File

@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
nova_service_port: 8774
# Consumed by Neutron role and must remained scoped to 'all' group
nova_metadata_port: 8775
nova_service_region: "{{ service_region }}"

1
group_vars/cinder_all.yml
View File

@ -14,7 +14,6 @@
# limitations under the License.
cinder_service_region: "{{ service_region }}"
cinder_service_port: 8776
# If there are Swift hosts in the environment, then enable cinder backups to it
cinder_service_backup_program_enabled: "{{ hostvars['localhost']['cinder_service_backup_program_enabled'] }}"

5
group_vars/keystone_all.yml
View File

@ -13,11 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
keystone_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(keystone_service_proto) }}"
keystone_service_publicuri_insecure: "{% if keystone_service_publicuri_proto == 'https' and (keystone_user_ssl_cert is not defined or haproxy_user_ssl_cert is not defined) | bool %}true{% else %}false{% endif %}"
keystone_service_publicuri: "{{ keystone_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ keystone_service_port }}"
keystone_service_publicurl: "{{ keystone_service_publicuri }}/v3"
# These are here rather than in keystone_all because
# both the os_ceilometer and os_keystone roles require them