From 4e994076effb8d376b753bb435f04e290bbfe12c Mon Sep 17 00:00:00 2001 From: Stuart Mackie Date: Thu, 27 Jul 2017 08:42:06 -0700 Subject: Change Contrail repo and key Change-Id: I70e996c1f75d7482a5ebfcc102e946d9fe05ac98 Signed-off-by: Stuart Mackie --- ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml | 68 ++------------------------- 1 file changed, 4 insertions(+), 64 deletions(-) (limited to 'ci/config_tpl') diff --git a/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml b/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml index 49d26ec7..a56c8039 100644 --- a/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml @@ -3,77 +3,17 @@ charm: ./{{ ubuntu.release }}/contrail-openstack options: install-keys: | - - | - -----BEGIN PGP PUBLIC KEY BLOCK----- - Version: GnuPG v1 - - mQENBFkff8kBCADm+xSDvRjblHEZ5aISb/j6pdvgLL5Ht1SgJ6a8EJdRBJGIt3lP - 6Eurvmn4gxm7McelpFMWsDKy+Rr0GJ6Wjq6CwFzDi2Vvl2IQpafYuYLGaFYG1/73 - 0+O0LclwPnVezQ9wu/AWkD/y6YJFhxDCCeBplNf/pdRzZg2c6BBugMBN2s0nsqHN - xKqRDItR8OxeVdF70bmdSecemHmB7ccoCMD5F81E2IdUN8ATpRqJOVXOMt2BWrj+ - dhQK2Amzv/qzYdYOvqYqvFqTl6RNy4YkOJIVc45hBoYxlRpd18/fT3ejWM25WZ2b - d+c5MNGRV2+2lgqqzRgUehBo2f4RDT+p4fAxABEBAAG0CWNvbnRyYWlsNIkBOAQT - AQIAIgUCWR9/yQIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQcsuWr0gx - U0w58wgAg+nmWRSDYNU99MU5tEMMurWMkwpC1V0uB20cr5z7gREyAUN+HAWV8Ngz - R+DMaDQK6JHPkNu8xNgyfAB7sO795DKF2aSP3RhephXsDJdyb55zEsjzmsJiZ9JI - sdkSg/6zRKkkK9S0VqY5C9jhj6TCUOVuJjk56ynbS/0klwUjpf6qqutJg0LyIWn0 - o3vdpVr/PVJUTK9uOriNXtQPkvai+7jBEJ28zaDCilLhdX0Kg4gmpgpm8IlscDGK - dqxQiraGvK3fGmmQ1mk5jEk5ydQOGvVIJO5N/H6AgBJ+xIUSU3yzNVJlfBUnBrSO - OHdFNOPnSrwZuepQfht8vWgwTArczrkBDQRZH3/JAQgAzZMwPBVjpstYnThsgWO5 - HQ9kbsviVWK/4ZHceYujfJ/ovZn/b9TGsvmL9U1dMJbBbBO6cFh7GvKFoIoR8c7g - QPHbh+MwH7EyBizpJPE+Fg+YP4hlaLvKf3bzVor9nFP4FUF671gXCFwvSbTMh/pm - EnOM6p6E/dWD2Ag1rcEX2lXn1sKvO+0nEdmHra8c6EeGhwt/sJ8MMVx61ZgKi0/Z - UGmfwBR004Tb4XBbUPOYzIZqtsK9lBUeFs6v3mNaZCBxzTb3fIXnqX5o9d7F/8ya - a+S+sLqYzheCiJz5JpYxh2GovoeDkPczd8HeAK9REedEs12grZj3cxnVyZApbeX5 - yQARAQABiQEfBBgBAgAJBQJZH3/JAhsMAAoJEHLLlq9IMVNMRFAIAJzEv6Y0ngqU - jgcE+kd+nLGtSgQ4MRWD5y0s8cLP/M5WNtJNWy70038fG3/ilh8Y4HsfTDu4ZMHQ - mVM1lpJg/U08fUIiU+iQfVnckB+Oj/irc2FgUF2YJSJwZkwFaIv0u1NKkvKr8Qmt - jJuAuNv97uHLF9fkAJGUrLGZDk5MmCNdnQDkPEn7NaRMxf+1SvbGvPS3jGzGbR0p - Umtdm5/zs4kre7xS71d4F5De4d1bhTNT8weC9KDJdXXf8xsuF1NPlxU/Cv6XB78Y - W2I4/FMkyQOkVZyNz20SbupiZt0L0ldlnk1brf2hoKagmBLNU8bXKrQAkqQTxJcT - d+E671t4w94= - =Fbaq - -----END PGP PUBLIC KEY BLOCK----- + "http:65.122.57.42/repo/key" install-sources: | - - "deb http://10.102.44.96/contrail4 /" + - "deb http:65.122.57.42/repo /" contrail-agent: charm: ./{{ ubuntu.release }}/contrail-agent options: install-keys: | - - | - -----BEGIN PGP PUBLIC KEY BLOCK----- - Version: GnuPG v1 - - mQENBFkff8kBCADm+xSDvRjblHEZ5aISb/j6pdvgLL5Ht1SgJ6a8EJdRBJGIt3lP - 6Eurvmn4gxm7McelpFMWsDKy+Rr0GJ6Wjq6CwFzDi2Vvl2IQpafYuYLGaFYG1/73 - 0+O0LclwPnVezQ9wu/AWkD/y6YJFhxDCCeBplNf/pdRzZg2c6BBugMBN2s0nsqHN - xKqRDItR8OxeVdF70bmdSecemHmB7ccoCMD5F81E2IdUN8ATpRqJOVXOMt2BWrj+ - dhQK2Amzv/qzYdYOvqYqvFqTl6RNy4YkOJIVc45hBoYxlRpd18/fT3ejWM25WZ2b - d+c5MNGRV2+2lgqqzRgUehBo2f4RDT+p4fAxABEBAAG0CWNvbnRyYWlsNIkBOAQT - AQIAIgUCWR9/yQIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQcsuWr0gx - U0w58wgAg+nmWRSDYNU99MU5tEMMurWMkwpC1V0uB20cr5z7gREyAUN+HAWV8Ngz - R+DMaDQK6JHPkNu8xNgyfAB7sO795DKF2aSP3RhephXsDJdyb55zEsjzmsJiZ9JI - sdkSg/6zRKkkK9S0VqY5C9jhj6TCUOVuJjk56ynbS/0klwUjpf6qqutJg0LyIWn0 - o3vdpVr/PVJUTK9uOriNXtQPkvai+7jBEJ28zaDCilLhdX0Kg4gmpgpm8IlscDGK - dqxQiraGvK3fGmmQ1mk5jEk5ydQOGvVIJO5N/H6AgBJ+xIUSU3yzNVJlfBUnBrSO - OHdFNOPnSrwZuepQfht8vWgwTArczrkBDQRZH3/JAQgAzZMwPBVjpstYnThsgWO5 - HQ9kbsviVWK/4ZHceYujfJ/ovZn/b9TGsvmL9U1dMJbBbBO6cFh7GvKFoIoR8c7g - QPHbh+MwH7EyBizpJPE+Fg+YP4hlaLvKf3bzVor9nFP4FUF671gXCFwvSbTMh/pm - EnOM6p6E/dWD2Ag1rcEX2lXn1sKvO+0nEdmHra8c6EeGhwt/sJ8MMVx61ZgKi0/Z - UGmfwBR004Tb4XBbUPOYzIZqtsK9lBUeFs6v3mNaZCBxzTb3fIXnqX5o9d7F/8ya - a+S+sLqYzheCiJz5JpYxh2GovoeDkPczd8HeAK9REedEs12grZj3cxnVyZApbeX5 - yQARAQABiQEfBBgBAgAJBQJZH3/JAhsMAAoJEHLLlq9IMVNMRFAIAJzEv6Y0ngqU - jgcE+kd+nLGtSgQ4MRWD5y0s8cLP/M5WNtJNWy70038fG3/ilh8Y4HsfTDu4ZMHQ - mVM1lpJg/U08fUIiU+iQfVnckB+Oj/irc2FgUF2YJSJwZkwFaIv0u1NKkvKr8Qmt - jJuAuNv97uHLF9fkAJGUrLGZDk5MmCNdnQDkPEn7NaRMxf+1SvbGvPS3jGzGbR0p - Umtdm5/zs4kre7xS71d4F5De4d1bhTNT8weC9KDJdXXf8xsuF1NPlxU/Cv6XB78Y - W2I4/FMkyQOkVZyNz20SbupiZt0L0ldlnk1brf2hoKagmBLNU8bXKrQAkqQTxJcT - d+E671t4w94= - =Fbaq - -----END PGP PUBLIC KEY BLOCK----- + "http:65.122.57.42/repo/key" install-sources: | - - "deb http://10.102.44.96/contrail4 /" + - "deb http:65.122.57.42/repo /" contrail-analytics: charm: ./{{ ubuntu.release }}/contrail-analytics -- cgit 1.2.3-korg