Merge "update defaults" into release/2019.2.0
diff --git a/barbican/client/v1/signed_images/octavia.yml b/barbican/client/v1/signed_images/octavia.yml
index ae708cf..ecc06e5 100644
--- a/barbican/client/v1/signed_images/octavia.yml
+++ b/barbican/client/v1/signed_images/octavia.yml
@@ -4,9 +4,6 @@
 parameters:
   _param:
     octavia_image_cert_key: '/etc/octavia/certs/image.key'
-    amphora_image_name:  "amphora-x64-haproxy"
-
-
   barbican:
     client:
       signed_images:
@@ -17,4 +14,4 @@
               secret_name: 'OctaviaAmphoraSecret'
               cert_key: ${_param:octavia_image_cert_key}
               name: ${_param:amphora_image_name}
-              cloud_name: octavia_identity
\ No newline at end of file
+              cloud_name: octavia_identity
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index f40654b..d73dc71 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -132,6 +132,9 @@
     octavia_health_manager_node01_address: 192.168.10.10
     octavia_health_manager_node02_address: 192.168.10.11
     octavia_health_manager_node03_address: 192.168.10.12
+    #
+    amphora_image_name: amphora-x64-haproxy
+    amphora_image_url: "https://artifactory.mirantis.com/binary-prod-local/mirantis/openstack/octavia/images/${_param:openstack_version}/amphora-x64-haproxy.qcow2"
     # HAproxy
     haproxy_openstack_web_bind_port: ${_param:horizon_public_port}
     #
diff --git a/glance/client/image/octavia.yml b/glance/client/image/octavia.yml
index 582f1bc..3160cdd 100644
--- a/glance/client/image/octavia.yml
+++ b/glance/client/image/octavia.yml
@@ -1,9 +1,6 @@
 classes:
 - system.glance.client
 parameters:
-  _param:
-    amphora_image_url: "https://artifactory.mirantis.com/binary-prod-local/mirantis/openstack/octavia/images/${_param:openstack_version}/amphora-x64-haproxy.qcow2"
-    amphora_image_name:  "amphora-x64-haproxy"
   glance:
     client:
       identity:
diff --git a/jenkins/client/job/deploy/update/init.yml b/jenkins/client/job/deploy/update/init.yml
index 5a1a8c1..3866d26 100644
--- a/jenkins/client/job/deploy/update/init.yml
+++ b/jenkins/client/job/deploy/update/init.yml
@@ -9,6 +9,7 @@
   - system.jenkins.client.job.deploy.update.upgrade_ovs_gateway
   - system.jenkins.client.job.deploy.update.upgrade_opencontrail
   - system.jenkins.client.job.deploy.update.upgrade_opencontrail4_0
+  - system.jenkins.client.job.deploy.update.update_opencontrail4
   - system.jenkins.client.job.deploy.update.upgrade_stacklight
   - system.jenkins.client.job.deploy.update.restore_mysql
   - system.jenkins.client.job.deploy.update.restore_cassandra
diff --git a/jenkins/client/job/deploy/update/update_opencontrail4.yml b/jenkins/client/job/deploy/update/update_opencontrail4.yml
new file mode 100644
index 0000000..72ea870
--- /dev/null
+++ b/jenkins/client/job/deploy/update/update_opencontrail4.yml
@@ -0,0 +1,47 @@
+#
+# Jobs to update packages on given Salt master environment
+#
+parameters:
+  _param:
+    jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+  jenkins:
+    client:
+      job:
+        deploy-update-opencontrail4:
+          type: workflow-scm
+          concurrent: true
+          discard:
+            build:
+              keep_num: 10
+            artifact:
+              keep_num: 10
+          display_name: "Deploy - update Opencontrail 4X"
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+            branch: "${_param:jenkins_pipelines_branch}"
+            credentials: "gerrit"
+            script: opencontrail4-update.groovy
+          param:
+            SALT_MASTER_URL:
+              type: string
+              default: "${_param:jenkins_salt_api_url}"
+            SALT_MASTER_CREDENTIALS:
+              type: string
+              default: "salt"
+            STAGE_CONTROLLERS_UPDATE:
+              type: boolean
+              default: 'true'
+              description: "Run update on Opencontrail controllers"
+            STAGE_COMPUTES_UPDATE:
+              type: boolean
+              default: 'true'
+              description: "Run update on Opencontrail compute nodes"
+            COMPUTE_TARGET_SERVERS:
+              type: string
+              default: "cmp*"
+              description: Salt compound target to match nodes to be updated [*, G@osfamily:debian].
+            COMPUTE_TARGET_SUBSET_LIVE:
+              type: string
+              default: '1'
+              description: Number of selected nodes to live apply compute update.