diff options
13 files changed, 48 insertions, 16 deletions
diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst index d003774..d497cc0 100644 --- a/docs/release/installation/installation.instruction.rst +++ b/docs/release/installation/installation.instruction.rst @@ -6,4 +6,6 @@ Deploy NFVi with Airship Installer ================================== -<Content is coming soon> +Please visit https://wiki.opnfv.org/display/AIR/Airship+Installer+Deployment+Guide +for how to deploy NFVi with Airship Installer. + diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst index d101ae1..ac521b4 100644 --- a/docs/release/release-notes/release-notes.rst +++ b/docs/release/release-notes/release-notes.rst @@ -21,6 +21,8 @@ Version History +--------------------+--------------------+--------------------+----------------------+ | 2019-11-17 | 0.1.0 | Bin Hu | Initial framework | +--------------------+--------------------+--------------------+----------------------+ +| 2019-12-19 | 1.0.0 | Bin Hu | Iruya release | ++--------------------+--------------------+--------------------+----------------------+ Release Data ------------ @@ -32,7 +34,7 @@ Release Data +--------------------------------------+--------------------------------------+ | **Release designation** | Iruya 9.0 | +--------------------------------------+--------------------------------------+ -| **Release date** | December 13, 2019 | +| **Release date** | January 10, 2020 | +--------------------------------------+--------------------------------------+ | **Purpose of the delivery** | OPNFV Iruya 9.0 Release | +--------------------------------------+--------------------------------------+ @@ -40,7 +42,7 @@ Release Data Important Notes --------------- -<Coming soon> +Please visit https://www.airshipit.org/ for upstream Airship Project. Summary ------- diff --git a/site/intel-pod10/site-definition.yaml b/site/intel-pod10/site-definition.yaml index 2c24965..f435f04 100644 --- a/site/intel-pod10/site-definition.yaml +++ b/site/intel-pod10/site-definition.yaml @@ -12,6 +12,6 @@ data: repositories: global: - revision: v1.4 + revision: v1.6 url: https://opendev.org/airship/treasuremap.git ... diff --git a/site/intel-pod10/software/charts/osh/openstack-compute-kit/neutron.yaml b/site/intel-pod10/software/charts/osh/openstack-compute-kit/neutron.yaml index f17a685..19b7c32 100644 --- a/site/intel-pod10/software/charts/osh/openstack-compute-kit/neutron.yaml +++ b/site/intel-pod10/software/charts/osh/openstack-compute-kit/neutron.yaml @@ -15,7 +15,7 @@ metadata: abstract: false layer: site parentSelector: - name: neutron-global + name: neutron-type actions: - method: merge path: . diff --git a/site/intel-pod10/software/charts/osh/openstack-compute-kit/nova.yaml b/site/intel-pod10/software/charts/osh/openstack-compute-kit/nova.yaml index e64738c..1dd5d65 100644 --- a/site/intel-pod10/software/charts/osh/openstack-compute-kit/nova.yaml +++ b/site/intel-pod10/software/charts/osh/openstack-compute-kit/nova.yaml @@ -12,11 +12,12 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: nova + replacement: true layeringDefinition: abstract: false layer: site parentSelector: - name: nova-global + name: nova-cntt actions: - method: merge path: . diff --git a/site/intel-pod17/networks/physical/networks.yaml b/site/intel-pod17/networks/physical/networks.yaml index 3cebeae..b8e1ea8 100644 --- a/site/intel-pod17/networks/physical/networks.yaml +++ b/site/intel-pod17/networks/physical/networks.yaml @@ -9,20 +9,20 @@ # +--------+------------+-----------------------------------+-----------+----------+----------------+ # |IF0 1G | dmz | OoB & OAM (default route) | VLAN 170 | untagged | 10.10.170.0/24 | # |IF1 1G | admin | PXE boot network | VLAN 171 | untagged | 10.10.171.0/24 | -# |IF2 10G | private | Underlay calico and ovs overlay | VLAN 172 | untagged | 10.10.172.0/24 | +# |IF2 10G | private | Underlay Calico and OVS overlay | VLAN 172 | untagged | 10.10.172.0/24 | # | | management | Management (unused for now) | VLAN 174 | tagged | 10.10.174.0/24 | # |IF3 10G | storage | Storage network | VLAN 173 | untagged | 10.10.173.0/24 | # | | public | Public network for VMs | VLAN 1173 | tagged | 10.10.175.0/24 | # +--------+------------+-----------------------------------+-----------+----------+----------------+ # -# For standard Airshipi/OPNFV deployments, you should not need to modify the +# For standard Airship/OPNFV deployments, you should not need to modify the # number of NetworkLinks and Networks in this file. Only the IP addresses and # CIDRs should need editing. # # The general Drydock documentation contains additional details, exmaples # and how-tos on working with Drydock/YAMLs in more generic way and enabling # custom/additional features not represented here (such as bonded networks). -# https://airship-drydock.readthedocs.io/en/latest/topology.html#defining-networking +# See https://airship-drydock.readthedocs.io/en/latest/topology.html#defining-networking schema: 'drydock/NetworkLink/v1' metadata: @@ -33,7 +33,7 @@ metadata: layer: site storagePolicy: cleartext data: - # MaaS doesnt own this network like it does the others, + # MaaS doesn't own this network like it does the others, # so the noconfig label is specified. labels: noconfig: enabled @@ -227,6 +227,7 @@ metadata: storagePolicy: cleartext data: # NEWSITE-CHANGEME: Set the VLAN ID which the Private network is on + # use '0' if the vlan is untagged vlan: '0' mtu: 1500 # NEWSITE-CHANGEME: Set the CIDR for the Private network @@ -296,6 +297,7 @@ metadata: storagePolicy: cleartext data: # NEWSITE-CHANGEME: Set the VLAN ID which the Storage network is on + # use '0' if the vlan is untagged vlan: '0' # NEWSITE-CHANGEME: Ensure the network switches in the environment are # configured for this MTU or greater. diff --git a/site/intel-pod17/profiles/region.yaml b/site/intel-pod17/profiles/region.yaml index 317f29a..cb68a0a 100644 --- a/site/intel-pod17/profiles/region.yaml +++ b/site/intel-pod17/profiles/region.yaml @@ -1,5 +1,5 @@ --- -# The purpose of this file is to define the drydock Region, which in turn drives +# The purpose of this file is to define the Drydock Region, which in turn drives # the MaaS region. schema: 'drydock/Region/v1' metadata: @@ -17,7 +17,7 @@ metadata: schema: pegleg/SoftwareVersions/v1 name: software-versions path: .packages.repositories.main_archive - # NEWSITE-CHANGEME: Substitutions from deckhand SSH public keys into the + # NEWSITE-CHANGEME: Substitutions from Deckhand SSH public keys into the # list of authorized keys which MaaS will register for the build-in "ubuntu" # account during the PXE process. Create a substitution rule for each SSH # key that should have access to the "ubuntu" account (useful for trouble- diff --git a/site/intel-pod17/secrets/certificates/certificates.yaml b/site/intel-pod17/secrets/certificates/certificates.yaml index a7aed5d..7940624 100644 --- a/site/intel-pod17/secrets/certificates/certificates.yaml +++ b/site/intel-pod17/secrets/certificates/certificates.yaml @@ -1,4 +1,6 @@ --- +# Example manifest for cert. +# NEWSITE-CHANGEME: must be replaced with proper/valid set, data: | -----BEGIN CERTIFICATE----- MIIDSDCCAjCgAwIBAgIUfRKmWCzUMEz+Qyn9PzxOdl+Oqv8wDQYJKoZIhvcNAQEL diff --git a/site/intel-pod17/secrets/passphrases/private_docker_key.yaml b/site/intel-pod17/secrets/passphrases/private_docker_key.yaml new file mode 100644 index 0000000..b423174 --- /dev/null +++ b/site/intel-pod17/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-pod17/secrets/publickey/jamesg_ssh_public_key.yaml b/site/intel-pod17/secrets/publickey/jamesg_ssh_public_key.yaml index 2d1ff59..2bb95e2 100644 --- a/site/intel-pod17/secrets/publickey/jamesg_ssh_public_key.yaml +++ b/site/intel-pod17/secrets/publickey/jamesg_ssh_public_key.yaml @@ -2,10 +2,10 @@ schema: deckhand/PublicKey/v1 metadata: schema: metadata/Document/v1 - name: kasparss_ssh_public_key + name: jamesg_ssh_public_key layeringDefinition: abstract: false layer: site storagePolicy: cleartext -data: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGR/CrUez0MkBvvxrXCmHr/pKqtuxpjyM3K684c1d9RYUiL+QXJonCZhfAK1Zlyy6YFbHsPQaoQ/4vwer1qPa1n1zScgeHsMdYpVn1VpCSt5zbCakxygGxCGedLMNAruj9VGDiv1Rv1ND6Cmg7v46vuvU21A9/bWeOo5JXcHvYWI2Ce8eWgaZx4YAw6YDY9oQtM4ioapYPtNYPtRV0okcrwb7JpwUOWvvfDtouDLlb1h1DBbpyWoOSH6aMv3he3yvtjYbhNJ+8tnH1WvMJe72arpleHGd0Te2WIUjdIKl8knFPrX6oriFmasq0OfrO8hgMOTPBC9lAVCCITZIl/K9D james.gu@att.com +data: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA7b3WfWHcluL4fIRgqain/96vqLeSwmHYr6WQe1RAITFbrSfU2fgtP+9z+8l1StJUBaRVsYSQEilksQclOm6ie6LrWhOPZq3b3bl+qidQ02iK1ErHKUak1YJj35SsU+h2MAkDszgrvIK7YbM6j8CMl2UfkT2Ps+mAEqdPOxvq5v49OtYOMHfssRB2rmeSzH7LKq9h3SSjDNwmP49IjgeLahjE1fBGBBy2/arg7kpAOW+o0He3QxgkZ7bqPIHAVMAxItCJjuDjneiXtMY9SGd/CdaFmxgu+YUMVAzFNwUN+uKixisEx3TTpWWqvblw+QJAVfeq629YobvBoPO0eLfR james.gu@att.com ... diff --git a/site/intel-pod17/site-definition.yaml b/site/intel-pod17/site-definition.yaml index adad752..d89dc73 100644 --- a/site/intel-pod17/site-definition.yaml +++ b/site/intel-pod17/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-pod17/software/charts/ucp/divingbell/divingbell.yaml b/site/intel-pod17/software/charts/ucp/divingbell/divingbell.yaml index c1259ee..41d5a9b 100644 --- a/site/intel-pod17/software/charts/ucp/divingbell/divingbell.yaml +++ b/site/intel-pod17/software/charts/ucp/divingbell/divingbell.yaml @@ -63,6 +63,12 @@ metadata: schema: deckhand/PublicKey/v1 name: trungdt_ssh_public_key path: . + - dest: + path: .values.conf.uamlite.users[5].user_sshkeys[0] + src: + schema: deckhand/PublicKey/v1 + name: jamesg_ssh_public_key + path: . data: values: conf: @@ -83,4 +89,7 @@ data: - user_name: trungdt user_sudo: true user_sshkeys: [] + - user_name: jamesg + user_sudo: true + user_sshkeys: [] ... diff --git a/site/intel-pod18/site-definition.yaml b/site/intel-pod18/site-definition.yaml index 2b1677a..dd5c5fc 100644 --- a/site/intel-pod18/site-definition.yaml +++ b/site/intel-pod18/site-definition.yaml @@ -12,6 +12,6 @@ data: repositories: global: - revision: v1.4 + revision: v1.6 url: https://opendev.org/airship/treasuremap.git ... |