Merge "Align options of glusterfs nova_instances volume" into stable/euphrates

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 0c1b82f..fbddc6e 100755 (executable)
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -45,7 +45,7 @@ salt -I 'keystone:server' state.sls keystone.server
 salt -I 'nova:controller' state.sls nova -b 1
 salt -I 'heat:server' state.sls heat -b 1
 
-salt -I 'cinder:controller' state.sls cinder -b 1
+wait_for 5 "salt -I 'cinder:controller' state.sls cinder -b 1"
 salt -I 'cinder:volume' state.sls cinder
 
 salt -I 'neutron:server' state.sls neutron -b 1

diff --git a/mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch b/mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch
index 9be6ca5..a4fb44b 100644 (file)
--- a/mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch
+++ b/mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch
@@ -20,12 +20,13 @@ Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
 ---
 
 diff --git a/maas/region.sls b/maas/region.sls
-index d3227ca..8a2243d 100644
 --- a/maas/region.sls
 +++ b/maas/region.sls
-@@ -179,8 +179,14 @@
+@@ -242,12 +242,16 @@
+   - require:
      - module: maas_config
 
+-{%- if region.get('sshprefs', False)  %}
  maas_sshprefs:
 -  module.run:
 -  - name: maas.process_sshprefs
@@ -35,8 +36,10 @@ index d3227ca..8a2243d 100644
 +# - name: maas.process_sshprefs
 +# - require:
 +  cmd.run:
-+  - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && SSH_KEY=$(cat authorized_keys | head -1) && maas opnfv sshkeys create \"key=$SSH_KEY\""
++  - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && SSH_KEY=$(cat authorized_keys | head -1) && (maas opnfv sshkeys read | grep -q \"$SSH_KEY\" || maas opnfv sshkeys create \"key=$SSH_KEY\")"
 +  - cwd: "/home/ubuntu/.ssh"
    - require:
      - module: maas_config
+-{%- endif %}
 
+ {%- endif %}

diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
index 867ccb7..a9a774b 100644 (file)
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
@@ -8,7 +8,7 @@
 ---
 parameters:
   _param:
-    salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2
+    salt_control_xenial_image: http://images.mirantis.com.s3.amazonaws.com/ubuntu-16-04-x64-latest.qcow2
 
     # VMs spawned on Foundation Node / Jump Host net ifaces (max 4)
     opnfv_fn_vm_primary_interface: ens3