Merge "Add 2way sync for oslo-templates formula"
diff --git a/aptly/server/repo/ubuntu/xenial/opencontrail.yml b/aptly/server/repo/ubuntu/xenial/opencontrail.yml
index 7f47577..6e90f75 100644
--- a/aptly/server/repo/ubuntu/xenial/opencontrail.yml
+++ b/aptly/server/repo/ubuntu/xenial/opencontrail.yml
@@ -123,6 +123,17 @@
- xenial-dev/nightly
architectures:
- amd64
+ ubuntu-xenial-oc50:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 5.0"
+ publisher:
+ component: oc50
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
ubuntu-xenial-oc666:
distribution: xenial
component: main
diff --git a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
index 91eafb0..7cc4ba2 100644
--- a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
@@ -131,6 +131,7 @@
94: "--exclude='/universe/o/(openstack-debian-images).*'"
95: "--exclude='/gcc-.*-cross.*'"
96: "--exclude='/(nvidia).*'"
+ 97: "--exclude='/universe/.*(metastudent).*'"
# List of unused linux kernels and unsupported arch
300: "--exclude='/.*(arm64|powerpc|s390x|armel|armhf|sparc64|mips64|ppc64el|mipsn32)(?!.*amd64)'"
301: "--exclude='(main|universe)/l/linux-*-(.*azure|.*aws|gke|.*azure-edge|.*oem/|.*euclid/)'"
@@ -181,7 +182,8 @@
802: "--include='/main(.*)python-(.*)network'"
803: "--include='/main(.*)unittest2'" # openstack* pkgs
804: "--include='/main(.*)libbluetooth3'" # python-guestfs
- 805: "--include='/main(.*)llvm-toolchain-5.0'" # pki-ca: < 389-ds-base < dogtag
+ # Get required llvm.But drop old llvm toolset.Old - if major in 1-5.
+ 805: '--include="/main(.*)llvm-toolchain-(?![1-5])"' # pki-ca: < 389-ds-base < dogtag
806: "--include='/main(.*)man-db'" # include man tool
807: "--include='/main(.*)zfs-doc'" # Some extra fs dep's for MAAS provision stage.PROD-21531
diff --git a/nginx/server/proxy/openstack/glance_registry.yml b/nginx/server/proxy/openstack/glance_registry.yml
new file mode 100644
index 0000000..b374e40
--- /dev/null
+++ b/nginx/server/proxy/openstack/glance_registry.yml
@@ -0,0 +1,25 @@
+parameters:
+ _param:
+ nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
+ nginx_proxy_openstack_glance_registry_protocol: 'http'
+ nginx_proxy_openstack_glance_registry_host: ${_param:glance_service_host}
+ nginx_proxy_openstack_api_address: 0.0.0.0
+ nginx:
+ server:
+ enabled: true
+ site:
+ nginx_proxy_openstack_api_glance_registry:
+ enabled: true
+ type: nginx_proxy
+ name: openstack_api_glance_registry
+ check: false
+ underscores_in_headers: true
+ proxy:
+ host: ${_param:nginx_proxy_openstack_glance_registry_host}
+ port: 9191
+ protocol: ${_param:nginx_proxy_openstack_glance_registry_protocol}
+ host:
+ name: ${_param:nginx_proxy_openstack_api_host}
+ port: 9191
+ address: ${_param:nginx_proxy_openstack_api_address}
+ ssl: ${_param:nginx_proxy_ssl}
diff --git a/nova/compute/nfv/sriov.yml b/nova/compute/nfv/sriov.yml
index b93363c..ac6bf98 100644
--- a/nova/compute/nfv/sriov.yml
+++ b/nova/compute/nfv/sriov.yml
@@ -13,9 +13,12 @@
kernel:
sriov: True
unsafe_interrupts: ${_param:sriov_unsafe_interrupts}
- rc:
- local: |
- #!/bin/sh -e
- # Enabling ${_param:sriov_nic01_numvfs} VFs on ${_param:sriov_nic01_device_name} PF
- echo ${_param:sriov_nic01_numvfs} > /sys/class/net/${_param:sriov_nic01_device_name}/device/sriov_numvfs; sleep 2; ip link set ${_param:sriov_nic01_device_name} up
- exit 0
\ No newline at end of file
+ network:
+ interface:
+ sriov_nic01:
+ pre_up_cmds:
+ - echo ${_param:sriov_nic01_numvfs} > /sys/class/net/${_param:sriov_nic01_device_name}/device/sriov_numvfs
+ enabled: true
+ name: ${_param:sriov_nic01_device_name}
+ type: eth
+ proto: manual