Update keystone to f710bed6aa445c33d3d307bdc144b6f7534d1282

f710bed6aa445c33d3d307bdc144b6f7534d1282 sanitize IPv6 in keystone provider

Change-Id: I6fcf4bc07659336335fd6010be8f9a93978ebf56

Update nova to e64bc9a57b2a9febad50181889faa19fba5f72ef

e64bc9a57b2a9febad50181889faa19fba5f72ef Re-add missing nova::dbsync_api anchors.

Change-Id: I4a2553875fc5db200a3e79e6ee4eec6c18cf6e5c

Puppetfile

@@ -107,7 +107,7 @@ mod 'keepalived',
   :git => 'https://github.com/Unyonsys/puppet-module-keepalived.git'
 
 mod 'keystone',
-  :commit => 'd9cecd44a916978d1a41b1e18c246e5d9175aa05',
+  :commit => 'f710bed6aa445c33d3d307bdc144b6f7534d1282',
   :git => 'https://github.com/openstack/puppet-keystone.git'
 
 mod 'kibana3',
@@ -159,7 +159,7 @@ mod 'neutron',
   :git => 'https://github.com/openstack/puppet-neutron.git'
 
 mod 'nova',
-  :commit => '1e12e9c45c5c567b3ae90c0d51875b20ef8b74a4',
+  :commit => 'e64bc9a57b2a9febad50181889faa19fba5f72ef',
   :git => 'https://github.com/openstack/puppet-nova.git'
 
 mod 'nssdb',

keystone/lib/puppet/provider/keystone.rb

@@ -29,7 +29,12 @@ def self.clean_host(host)
     when '::0'
       return '[::1]'
     else
-      return host
+      # if ipv6, make sure ip address has brackets - LP#1541512
+      if host.include?(':') and !host.include?(']')
+        return "[" + host + "]"
+      else
+        return host
+      end
     end
   end
 

keystone/spec/unit/provider/keystone_spec.rb

@@ -194,6 +194,14 @@ class AnotherKlass < Puppet::Provider::Keystone
       expect(klass.get_admin_endpoint).to eq('http://[::1]:5001')
     end
 
+    it 'should use [2620:52:0:23a9::25] in the admin endpoint if bind_host is 2620:52:0:23a9::25' do
+      mock = {'DEFAULT' => { 'admin_bind_host' => '2620:52:0:23a9::25', 'admin_port' => '5001' }}
+      File.expects(:exists?).with("/etc/keystone/keystone.conf").returns(true)
+      Puppet::Util::IniConfig::File.expects(:new).returns(mock)
+      mock.expects(:read).with('/etc/keystone/keystone.conf')
+      expect(klass.get_admin_endpoint).to eq('http://[2620:52:0:23a9::25]:5001')
+    end
+
     it 'should use localhost in the admin endpoint if bind_host is unspecified' do
       mock = {'DEFAULT' => { 'admin_port' => '5001' }}
       File.expects(:exists?).with("/etc/keystone/keystone.conf").returns(true)

nova/manifests/deps.pp

@@ -20,6 +20,8 @@
   -> anchor { 'nova::db::end': }
   ~> anchor { 'nova::dbsync::begin': }
   -> anchor { 'nova::dbsync::end': }
+  ~> anchor { 'nova::dbsync_api::begin': }
+  -> anchor { 'nova::dbsync_api::end': }
   ~> anchor { 'nova::service::begin': }
   ~> Service<| tag == 'nova-service' |>
   ~> anchor { 'nova::service::end': }
@@ -43,10 +45,13 @@
   # The following resourcs are managed by calling 'nova manage' and so the
   # database must be provisioned before they can be applied.
   Anchor['nova::dbsync::end']
+  -> Anchor['nova::dbsync_api::end']
   -> Nova_cells<||>
   Anchor['nova::dbsync::end']
+  -> Anchor['nova::dbsync_api::end']
   -> Nova_floating<||>
   Anchor['nova::dbsync::end']
+  -> Anchor['nova::dbsync_api::end']
   -> Nova_network<||>
 
   # Installation or config changes will always restart services.