Move amphora_image_name|url to defaults
Change-Id: I511cbcd518df1b511837a7633f2967b4cb9a5782
Prod-related: PROD-26621 (PROD:26621)
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 cd8c070..70b0115 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -138,6 +138,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: