summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/services/iscsid.yaml4
-rw-r--r--puppet/services/manila-scheduler.yaml2
-rw-r--r--puppet/services/openvswitch.yaml4
-rw-r--r--releasenotes/notes/fix-neutron_admin_auth_url-c88224251d8eb807.yaml4
4 files changed, 9 insertions, 5 deletions
diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml
index 80519800..c34a59d5 100644
--- a/docker/services/iscsid.yaml
+++ b/docker/services/iscsid.yaml
@@ -109,7 +109,7 @@ outputs:
- name: Stop and disable iscsid service
tags: step2
service: name=iscsid state=stopped enabled=no
- when: stat_iscsid_service.stat.exists
+ when: (stat_iscsid_service.stat|default('')).exists|default(false)
- name: stat /lib/systemd/system/iscsid.socket
tags: step2
stat: path=/lib/systemd/system/iscsid.socket
@@ -117,4 +117,4 @@ outputs:
- name: Stop and disable iscsid.socket service
tags: step2
service: name=iscsid.socket state=stopped enabled=no
- when: stat_iscsid_socket.stat.exists
+ when: (stat_iscsid_socket.stat|default('')).exists|default(false)
diff --git a/puppet/services/manila-scheduler.yaml b/puppet/services/manila-scheduler.yaml
index 7d43f685..364a1a3d 100644
--- a/puppet/services/manila-scheduler.yaml
+++ b/puppet/services/manila-scheduler.yaml
@@ -70,7 +70,7 @@ outputs:
manila::compute::nova::nova_admin_password: {get_param: NovaPassword}
manila::compute::nova::nova_admin_tenant_name: 'service'
manila::network::neutron::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]}
- manila::network::neutron::neutron_admin_auth_url: {get_param: [EndpointMap, NeutronAdmin, uri]}
+ manila::network::neutron::neutron_admin_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
manila::network::neutron::neutron_admin_password: {get_param: NeutronPassword}
step_config: |
include ::tripleo::profile::base::manila::scheduler
diff --git a/puppet/services/openvswitch.yaml b/puppet/services/openvswitch.yaml
index d8061d4b..6479d7f9 100644
--- a/puppet/services/openvswitch.yaml
+++ b/puppet/services/openvswitch.yaml
@@ -179,6 +179,6 @@ outputs:
with_items:
- "{{ovs_list_of_rpms.stdout_lines}}"
tags: step2
- when: "'2.5.0-14' in '{{ovs_version.stdout}}'
+ when: "'2.5.0-14' in ovs_version.stdout|default('')
or
- ovs_packaging_issue|succeeded"
+ ovs_packaging_issue|default(false)|succeeded"
diff --git a/releasenotes/notes/fix-neutron_admin_auth_url-c88224251d8eb807.yaml b/releasenotes/notes/fix-neutron_admin_auth_url-c88224251d8eb807.yaml
new file mode 100644
index 00000000..fa4074b1
--- /dev/null
+++ b/releasenotes/notes/fix-neutron_admin_auth_url-c88224251d8eb807.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+ - The "neutron_admin_auth_url" is now properly set using KeystoneInternal
+ rather than using the NeutronAdmin endpoint.