diff options
8 files changed, 47 insertions, 31 deletions
@@ -5,9 +5,9 @@ project_creation_date: '2019-07-02-12' project_category: 'Deployment' lifecycle_state: 'Incubation' project_lead: &opnfv_airship_ptl - name: 'Bin Hu' - email: 'bin.hu@att.com' - id: 'bh526r' + name: 'James Gu' + email: 'james.gu@att.com' + id: 'jamesgu' company: 'AT&T' timezone: '' primary_contact: *opnfv_airship_ptl @@ -60,6 +60,11 @@ committers: company: 'Intel' id: 'trev' timezone: '' + - name: 'Bin Hu' + email: 'bin.hu@att.com' + id: 'bh526r' + company: 'AT&T' + timezone: '' - name: 'Cedric Ollivier' email: 'cedric.ollivier@orange.com' company: 'Orange' diff --git a/site/intel-pod10/secrets/passphrases/private_docker_key.yaml b/site/intel-pod10/secrets/passphrases/private_docker_key.yaml new file mode 100644 index 0000000..b423174 --- /dev/null +++ b/site/intel-pod10/secrets/passphrases/private_docker_key.yaml @@ -0,0 +1,14 @@ +--- +schema: deckhand/Passphrase/v1 +metadata: + schema: metadata/Document/v1 + name: private_docker_key + layeringDefinition: + abstract: false + layer: site + storagePolicy: cleartext +# sample key for potential private docker registry +# see Docker documentation for info on how to generate the key +# base64 of password123 +data: cGFzc3dvcmQxMjM= +... diff --git a/site/intel-pod10/site-definition.yaml b/site/intel-pod10/site-definition.yaml index f435f04..33a0e33 100644 --- a/site/intel-pod10/site-definition.yaml +++ b/site/intel-pod10/site-definition.yaml @@ -12,6 +12,6 @@ data: repositories: global: - revision: v1.6 + revision: v1.7 url: https://opendev.org/airship/treasuremap.git ... diff --git a/site/intel-pod15/secrets/passphrases/private_docker_key.yaml b/site/intel-pod15/secrets/passphrases/private_docker_key.yaml new file mode 100644 index 0000000..b423174 --- /dev/null +++ b/site/intel-pod15/secrets/passphrases/private_docker_key.yaml @@ -0,0 +1,14 @@ +--- +schema: deckhand/Passphrase/v1 +metadata: + schema: metadata/Document/v1 + name: private_docker_key + layeringDefinition: + abstract: false + layer: site + storagePolicy: cleartext +# sample key for potential private docker registry +# see Docker documentation for info on how to generate the key +# base64 of password123 +data: cGFzc3dvcmQxMjM= +... diff --git a/site/intel-pod15/site-definition.yaml b/site/intel-pod15/site-definition.yaml index ad0ce21..dfafb62 100644 --- a/site/intel-pod15/site-definition.yaml +++ b/site/intel-pod15/site-definition.yaml @@ -12,6 +12,6 @@ data: repositories: global: - revision: v1.6 + revision: v1.7 url: https://opendev.org/airship/treasuremap.git ... diff --git a/type/cntt/software/charts/osh/openstack-compute-kit/neutron-ovsdpdk.yaml b/type/cntt/software/charts/osh/openstack-compute-kit/neutron-ovsdpdk.yaml index 12e06f2..6c2d228 100644 --- a/type/cntt/software/charts/osh/openstack-compute-kit/neutron-ovsdpdk.yaml +++ b/type/cntt/software/charts/osh/openstack-compute-kit/neutron-ovsdpdk.yaml @@ -169,6 +169,9 @@ data: vf_index: 0 - name: dpdk_b0s1 vf_index: 0 + neutron: + DEFAULT: + service_plugins: router,trunk plugins: openvswitch_agent: default: diff --git a/type/cntt/software/charts/osh/openstack-compute-kit/neutron.yaml b/type/cntt/software/charts/osh/openstack-compute-kit/neutron.yaml index d220fcb..b6b8f7d 100644 --- a/type/cntt/software/charts/osh/openstack-compute-kit/neutron.yaml +++ b/type/cntt/software/charts/osh/openstack-compute-kit/neutron.yaml @@ -19,4 +19,8 @@ data: pod: replicas: server: 9 + conf: + neutron: + DEFAULT: + service_plugins: router,trunk ... diff --git a/type/cntt/software/charts/osh/openstack-glance/glance.yaml b/type/cntt/software/charts/osh/openstack-glance/glance.yaml index cbc0f5d..0442bc6 100644 --- a/type/cntt/software/charts/osh/openstack-glance/glance.yaml +++ b/type/cntt/software/charts/osh/openstack-glance/glance.yaml @@ -16,6 +16,8 @@ metadata: path: . storagePolicy: cleartext data: + test: + enabled: false values: pod: replicas: @@ -24,30 +26,4 @@ data: conf: rally_tests: run_tempest: false - tests: - GlanceImages.create_and_delete_image: - - args: - container_format: bare - disk_format: qcow2 - image_location: https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img - runner: - concurrency: 1 - times: 1 - type: constant - sla: - failure_rate: - max: 0 - GlanceImages.create_and_list_image: - - args: - container_format: bare - disk_format: qcow2 - image_location: https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img - runner: - concurrency: 1 - times: 1 - type: constant - sla: - failure_rate: - max: 0 - ... |