Merge "Add oc50 repos"
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