Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/111795
Change subject: Try using a proper username/pass for neutron auth
......................................................................
Try using a proper username/pass for neutron auth
Change-Id: Ia3860f2680aa9c8ed7e0afcd3d8928ff974917d7
---
M manifests/role/nova.pp
M templates/openstack/havana/nova/nova.conf.erb
2 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/111795/1
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 60ce83c..a1200f9 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -16,6 +16,7 @@
db_user => "nova",
db_pass => $passwords::openstack::nova::nova_db_pass,
metadata_pass =>
$passwords::openstack::nova::nova_metadata_pass,
+ neutron_ldap_user_pass =>
$passwords::openstack::neutron::neutron_ldap_user_pass,
my_ip => $ipaddress_eth0,
ldap_base_dn => "dc=wikimedia,dc=org",
ldap_user_dn => "uid=novaadmin,ou=people,dc=wikimedia,dc=org",
diff --git a/templates/openstack/havana/nova/nova.conf.erb
b/templates/openstack/havana/nova/nova.conf.erb
index 3e6d6ec..c1d02c9 100644
--- a/templates/openstack/havana/nova/nova.conf.erb
+++ b/templates/openstack/havana/nova/nova.conf.erb
@@ -47,7 +47,9 @@
network_api_class = nova.network.neutronv2.api.API
neutron_url = http://<%= novaconfig['controller_hostname'] %>:9696
neutron_auth_strategy = keystone
-neutron_admin_token = <%= novaconfig['keystone_admin_token'] %>
+neutron_admin_tenant_name=testlabs
+neutron_admin_username=neutron
+neutron_admin_password=<%= novaconfig['neutron_ldap_user_pass'] %>
neutron_admin_auth_url = http://<%= novaconfig['controller_hostname']
%>:35357/v2.0
linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver
firewall_driver = nova.virt.libvirt.firewall.IptablesFirewallDriver
--
To view, visit https://gerrit.wikimedia.org/r/111795
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3860f2680aa9c8ed7e0afcd3d8928ff974917d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
