diff --git a/.zuul.yaml b/.zuul.yaml index a995cc8d6..85ffe57d5 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -18,13 +18,13 @@ rtd_project_name: 'airship-treasuremap' check: jobs: - - treasuremap-airship-seaworthy-site-lint + - treasuremap-seaworthy-site-lint - treasuremap-airskiff-site-lint - treasuremap-airsloop-site-lint - treasuremap-airskiff-deployment-ubuntu gate: jobs: - - treasuremap-airship-seaworthy-site-lint + - treasuremap-seaworthy-site-lint - treasuremap-airskiff-site-lint - treasuremap-airsloop-site-lint - treasuremap-airskiff-deployment-ubuntu @@ -42,7 +42,7 @@ - job: name: treasuremap-site-lint description: - Lint a site using Pegleg. Default site is airship-seaworthy. + Lint a site using Pegleg. Default site is seaworthy. nodeset: treasuremap-single-node timeout: 900 pre-run: @@ -52,18 +52,18 @@ required-projects: - airship/pegleg vars: - site: airship-seaworthy + site: seaworthy irrelevant-files: - ^.*\.rst$ - ^doc/.*$ - job: - name: treasuremap-airship-seaworthy-site-lint + name: treasuremap-seaworthy-site-lint description: | - Lint the airship-seaworthy site using Pegleg. + Lint the seaworthy site using Pegleg. parent: treasuremap-site-lint vars: - site: airship-seaworthy + site: seaworthy irrelevant-files: - ^.*\.rst$ - ^doc/.*$ @@ -80,7 +80,7 @@ irrelevant-files: - ^.*\.rst$ - ^doc/.*$ - - ^site/airship-seaworthy/.*$ + - ^site/seaworthy/.*$ - ^site/airsloop/.*$ - job: @@ -93,7 +93,7 @@ irrelevant-files: - ^.*\.rst$ - ^doc/.*$ - - ^site/airship-seaworthy/.*$ + - ^site/seaworthy/.*$ - ^site/airskiff/.*$ - job: @@ -111,7 +111,7 @@ irrelevant-files: - ^.*\.rst$ - ^doc/.*$ - - ^site/airship-seaworthy/.*$ + - ^site/seaworthy/.*$ - ^site/airsloop/.*$ - secret: diff --git a/doc/source/airsloop.rst b/doc/source/airsloop.rst index 9e0dd0cc3..647dbf864 100644 --- a/doc/source/airsloop.rst +++ b/doc/source/airsloop.rst @@ -6,7 +6,7 @@ The goal of this site is to be used as a reference for mini Airship deployments with one controller and one or more compute nodes. Airsloop is meant to get an operator up and running quickly with an Airship lab environment, -and has some resiliency and security features tuned down. Please see the `Seaworthy `__ +and has some resiliency and security features tuned down. Please see the `Seaworthy `__ manifests for a production-oriented example. The site manifests are available at diff --git a/doc/source/authoring_and_deployment.rst b/doc/source/authoring_and_deployment.rst index f4d204dd5..2e67df9c6 100644 --- a/doc/source/authoring_and_deployment.rst +++ b/doc/source/authoring_and_deployment.rst @@ -13,7 +13,7 @@ Airship site. This can be broken down into two high-level pieces: This document is an "all in one" site authoring guide + deployment guide for a standard Airship deployment. For the most part, the site -authoring guidance lives within ``airship-seaworthy`` reference site in the +authoring guidance lives within ``seaworthy`` reference site in the form of YAML comments. Terminology @@ -197,19 +197,19 @@ To gain a full understanding of the pegleg structure, it is highly recommended to read pegleg documentation on this `here `__. -The ``airship-seaworthy`` site may be used as reference site. It is the +The ``seaworthy`` site may be used as reference site. It is the principal pipeline for integration and continuous deployment testing of Airship. Change directory to the ``airship-treasuremap/site`` folder and copy the -``airship-seaworthy`` site as follows: +``seaworthy`` site as follows: :: NEW_SITE=mySite # replace with the name of your site cd airship-treasuremap/site - cp -r airship-seaworthy $NEW_SITE + cp -r seaworthy $NEW_SITE -Remove ``airship-seaworthy`` specific certificates. +Remove ``seaworthy`` specific certificates. :: diff --git a/doc/source/config_update_guide.rst b/doc/source/config_update_guide.rst index a25f176b7..69f9aa710 100644 --- a/doc/source/config_update_guide.rst +++ b/doc/source/config_update_guide.rst @@ -47,8 +47,8 @@ site: :: - export SITE=airship-seaworthy - export SITE_PATH=treasuremap/site/airship-seaworthy + export SITE=seaworthy + export SITE_PATH=treasuremap/site/seaworthy Updating the manifests ---------------------- @@ -141,11 +141,11 @@ Install Airship CLI as described in `Configuring Airship CLI`_ section. Set the name of your site: :: - export SITE=airship-seaworthy + export SITE=seaworthy Configure credentials for accessing Shipyard; the password is stored in ``ucp_shipyard_keystone_password`` secret, you can find it in -``site/airship-seaworthy/secrets/passphrases/ucp_shipyard_keystone_password.yaml`` +``site/seaworthy/secrets/passphrases/ucp_shipyard_keystone_password.yaml`` configuration file of your site. :: diff --git a/doc/source/seaworthy.rst b/doc/source/seaworthy.rst index 9fb3b9d82..c0781f52d 100644 --- a/doc/source/seaworthy.rst +++ b/doc/source/seaworthy.rst @@ -5,7 +5,7 @@ Airship Seaworthy is a multi-node site deployment reference and continuous integration pipeline. The site manifests are available at -`site/airship-seaworthy `__. +`site/seaworthy `__. Pipeline @@ -42,7 +42,7 @@ to align parts of the system such as Ceph replication, etcd, etc. Airship Seaworthy site has 6 DELL R720xd bare-metal servers: 3 control, and 3 compute nodes. -See host profiles for the servers `here `__. +See host profiles for the servers `here `__. Control (masters) - cab23-r720-11 @@ -59,7 +59,7 @@ Network ------- Physical (underlay) networks are described in Drydock site configuration -`here `__. +`here `__. It defines OOB (iLO/IPMI), untagged PXE, and multiple tagged general use networks. Calico overlay for k8s POD networking uses IPIP mesh. diff --git a/doc/source/troubleshooting_guide.rst b/doc/source/troubleshooting_guide.rst index c5535ff57..072a4897d 100644 --- a/doc/source/troubleshooting_guide.rst +++ b/doc/source/troubleshooting_guide.rst @@ -74,7 +74,7 @@ where it fails, there are two major deployment steps: After `Configuring Airship CLI`_, setup credentials for accessing Shipyard; the password is stored in ``ucp_shipyard_keystone_password`` secret, you can find it in -``site/airship-seaworthy/secrets/passphrases/ucp_shipyard_keystone_password.yaml`` +``site/seaworthy/secrets/passphrases/ucp_shipyard_keystone_password.yaml`` configuration file of your site. :: diff --git a/site/airskiff/profiles/region.yaml b/site/airskiff/profiles/region.yaml index a5495d0c9..9db891bdb 100644 --- a/site/airskiff/profiles/region.yaml +++ b/site/airskiff/profiles/region.yaml @@ -7,7 +7,7 @@ schema: 'drydock/Region/v1' metadata: schema: 'metadata/Document/v1' # NEWSITE-CHANGEME: Replace with the site name - name: airship-seaworthy + name: airskiff layeringDefinition: abstract: false layer: site @@ -18,14 +18,14 @@ metadata: # account during the PXE process. Create a substitution rule for each SSH # key that should have access to the "ubuntu" account (useful for trouble- # shooting problems before UAM or UAM-lite is operational). SSH keys are - # stored as secrets in site/airship-seaworthy/secrets. + # stored as secrets in site/seaworthy/secrets. - dest: # Add/replace the first item in the list path: .authorized_keys[0] src: schema: deckhand/PublicKey/v1 # This should match the "name" metadata of the SSH key which will be - # substituted, located in site/airship-seaworthy/secrets folder. + # substituted, located in site/seaworthy/secrets folder. name: airship_ssh_public_key path: . - dest: diff --git a/site/airship-seaworthy/baremetal/bootactions/promjoin.yaml b/site/seaworthy/baremetal/bootactions/promjoin.yaml similarity index 100% rename from site/airship-seaworthy/baremetal/bootactions/promjoin.yaml rename to site/seaworthy/baremetal/bootactions/promjoin.yaml diff --git a/site/airship-seaworthy/baremetal/nodes.yaml b/site/seaworthy/baremetal/nodes.yaml similarity index 100% rename from site/airship-seaworthy/baremetal/nodes.yaml rename to site/seaworthy/baremetal/nodes.yaml diff --git a/site/airship-seaworthy/deployment/deployment-configuration.yaml b/site/seaworthy/deployment/deployment-configuration.yaml similarity index 100% rename from site/airship-seaworthy/deployment/deployment-configuration.yaml rename to site/seaworthy/deployment/deployment-configuration.yaml diff --git a/site/airship-seaworthy/networks/common-addresses.yaml b/site/seaworthy/networks/common-addresses.yaml similarity index 100% rename from site/airship-seaworthy/networks/common-addresses.yaml rename to site/seaworthy/networks/common-addresses.yaml diff --git a/site/airship-seaworthy/networks/physical/networks.yaml b/site/seaworthy/networks/physical/networks.yaml similarity index 100% rename from site/airship-seaworthy/networks/physical/networks.yaml rename to site/seaworthy/networks/physical/networks.yaml diff --git a/site/airship-seaworthy/pki/pki-catalog.yaml b/site/seaworthy/pki/pki-catalog.yaml similarity index 100% rename from site/airship-seaworthy/pki/pki-catalog.yaml rename to site/seaworthy/pki/pki-catalog.yaml diff --git a/site/airship-seaworthy/profiles/genesis.yaml b/site/seaworthy/profiles/genesis.yaml similarity index 100% rename from site/airship-seaworthy/profiles/genesis.yaml rename to site/seaworthy/profiles/genesis.yaml diff --git a/site/airship-seaworthy/profiles/hardware/dell_r720.yaml b/site/seaworthy/profiles/hardware/dell_r720.yaml similarity index 100% rename from site/airship-seaworthy/profiles/hardware/dell_r720.yaml rename to site/seaworthy/profiles/hardware/dell_r720.yaml diff --git a/site/airship-seaworthy/profiles/host/cp_r720.yaml b/site/seaworthy/profiles/host/cp_r720.yaml similarity index 100% rename from site/airship-seaworthy/profiles/host/cp_r720.yaml rename to site/seaworthy/profiles/host/cp_r720.yaml diff --git a/site/airship-seaworthy/profiles/host/dp_r720.yaml b/site/seaworthy/profiles/host/dp_r720.yaml similarity index 100% rename from site/airship-seaworthy/profiles/host/dp_r720.yaml rename to site/seaworthy/profiles/host/dp_r720.yaml diff --git a/site/airship-seaworthy/profiles/region.yaml b/site/seaworthy/profiles/region.yaml similarity index 91% rename from site/airship-seaworthy/profiles/region.yaml rename to site/seaworthy/profiles/region.yaml index 9bef95a52..f8ac846c0 100644 --- a/site/airship-seaworthy/profiles/region.yaml +++ b/site/seaworthy/profiles/region.yaml @@ -5,7 +5,7 @@ schema: 'drydock/Region/v1' metadata: schema: 'metadata/Document/v1' # NEWSITE-CHANGEME: Replace with the site name - name: airship-seaworthy + name: seaworthy layeringDefinition: abstract: false layer: site @@ -16,14 +16,14 @@ metadata: # account during the PXE process. Create a substitution rule for each SSH # key that should have access to the "ubuntu" account (useful for trouble- # shooting problems before UAM or UAM-lite is operational). SSH keys are - # stored as secrets in site/airship-seaworthy/secrets. + # stored as secrets in site/seaworthy/secrets. - dest: # Add/replace the first item in the list path: .authorized_keys[0] src: schema: deckhand/PublicKey/v1 # This should match the "name" metadata of the SSH key which will be - # substituted, located in site/airship-seaworthy/secrets folder. + # substituted, located in site/seaworthy/secrets folder. name: airship_ssh_public_key path: . - dest: diff --git a/site/airship-seaworthy/secrets/certificates/certificates.yaml b/site/seaworthy/secrets/certificates/certificates.yaml similarity index 100% rename from site/airship-seaworthy/secrets/certificates/certificates.yaml rename to site/seaworthy/secrets/certificates/certificates.yaml diff --git a/site/airship-seaworthy/secrets/certificates/ingress.yaml b/site/seaworthy/secrets/certificates/ingress.yaml similarity index 100% rename from site/airship-seaworthy/secrets/certificates/ingress.yaml rename to site/seaworthy/secrets/certificates/ingress.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ceph_fsid.yaml b/site/seaworthy/secrets/passphrases/ceph_fsid.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ceph_fsid.yaml rename to site/seaworthy/secrets/passphrases/ceph_fsid.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ceph_swift_keystone_password.yaml b/site/seaworthy/secrets/passphrases/ceph_swift_keystone_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ceph_swift_keystone_password.yaml rename to site/seaworthy/secrets/passphrases/ceph_swift_keystone_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ipmi_admin_password.yaml b/site/seaworthy/secrets/passphrases/ipmi_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ipmi_admin_password.yaml rename to site/seaworthy/secrets/passphrases/ipmi_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/maas-region-key.yaml b/site/seaworthy/secrets/passphrases/maas-region-key.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/maas-region-key.yaml rename to site/seaworthy/secrets/passphrases/maas-region-key.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_barbican_oslo_db_password.yaml b/site/seaworthy/secrets/passphrases/osh_barbican_oslo_db_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_barbican_oslo_db_password.yaml rename to site/seaworthy/secrets/passphrases/osh_barbican_oslo_db_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_barbican_oslo_messaging_admin_password.yaml b/site/seaworthy/secrets/passphrases/osh_barbican_oslo_messaging_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_barbican_oslo_messaging_admin_password.yaml rename to site/seaworthy/secrets/passphrases/osh_barbican_oslo_messaging_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_barbican_oslo_messaging_password.yaml b/site/seaworthy/secrets/passphrases/osh_barbican_oslo_messaging_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_barbican_oslo_messaging_password.yaml rename to site/seaworthy/secrets/passphrases/osh_barbican_oslo_messaging_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_barbican_password.yaml b/site/seaworthy/secrets/passphrases/osh_barbican_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_barbican_password.yaml rename to site/seaworthy/secrets/passphrases/osh_barbican_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_barbican_rabbitmq_erlang_cookie.yaml b/site/seaworthy/secrets/passphrases/osh_barbican_rabbitmq_erlang_cookie.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_barbican_rabbitmq_erlang_cookie.yaml rename to site/seaworthy/secrets/passphrases/osh_barbican_rabbitmq_erlang_cookie.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_cinder_oslo_db_password.yaml b/site/seaworthy/secrets/passphrases/osh_cinder_oslo_db_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_cinder_oslo_db_password.yaml rename to site/seaworthy/secrets/passphrases/osh_cinder_oslo_db_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_cinder_oslo_messaging_admin_password.yaml b/site/seaworthy/secrets/passphrases/osh_cinder_oslo_messaging_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_cinder_oslo_messaging_admin_password.yaml rename to site/seaworthy/secrets/passphrases/osh_cinder_oslo_messaging_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_cinder_oslo_messaging_password.yaml b/site/seaworthy/secrets/passphrases/osh_cinder_oslo_messaging_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_cinder_oslo_messaging_password.yaml rename to site/seaworthy/secrets/passphrases/osh_cinder_oslo_messaging_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_cinder_password.yaml b/site/seaworthy/secrets/passphrases/osh_cinder_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_cinder_password.yaml rename to site/seaworthy/secrets/passphrases/osh_cinder_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_cinder_rabbitmq_erlang_cookie.yaml b/site/seaworthy/secrets/passphrases/osh_cinder_rabbitmq_erlang_cookie.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_cinder_rabbitmq_erlang_cookie.yaml rename to site/seaworthy/secrets/passphrases/osh_cinder_rabbitmq_erlang_cookie.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_glance_oslo_db_password.yaml b/site/seaworthy/secrets/passphrases/osh_glance_oslo_db_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_glance_oslo_db_password.yaml rename to site/seaworthy/secrets/passphrases/osh_glance_oslo_db_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_glance_oslo_messaging_admin_password.yaml b/site/seaworthy/secrets/passphrases/osh_glance_oslo_messaging_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_glance_oslo_messaging_admin_password.yaml rename to site/seaworthy/secrets/passphrases/osh_glance_oslo_messaging_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_glance_oslo_messaging_password.yaml b/site/seaworthy/secrets/passphrases/osh_glance_oslo_messaging_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_glance_oslo_messaging_password.yaml rename to site/seaworthy/secrets/passphrases/osh_glance_oslo_messaging_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_glance_password.yaml b/site/seaworthy/secrets/passphrases/osh_glance_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_glance_password.yaml rename to site/seaworthy/secrets/passphrases/osh_glance_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_glance_rabbitmq_erlang_cookie.yaml b/site/seaworthy/secrets/passphrases/osh_glance_rabbitmq_erlang_cookie.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_glance_rabbitmq_erlang_cookie.yaml rename to site/seaworthy/secrets/passphrases/osh_glance_rabbitmq_erlang_cookie.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_heat_oslo_db_password.yaml b/site/seaworthy/secrets/passphrases/osh_heat_oslo_db_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_heat_oslo_db_password.yaml rename to site/seaworthy/secrets/passphrases/osh_heat_oslo_db_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_heat_oslo_messaging_admin_password.yaml b/site/seaworthy/secrets/passphrases/osh_heat_oslo_messaging_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_heat_oslo_messaging_admin_password.yaml rename to site/seaworthy/secrets/passphrases/osh_heat_oslo_messaging_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_heat_oslo_messaging_password.yaml b/site/seaworthy/secrets/passphrases/osh_heat_oslo_messaging_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_heat_oslo_messaging_password.yaml rename to site/seaworthy/secrets/passphrases/osh_heat_oslo_messaging_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_heat_password.yaml b/site/seaworthy/secrets/passphrases/osh_heat_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_heat_password.yaml rename to site/seaworthy/secrets/passphrases/osh_heat_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_heat_rabbitmq_erlang_cookie.yaml b/site/seaworthy/secrets/passphrases/osh_heat_rabbitmq_erlang_cookie.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_heat_rabbitmq_erlang_cookie.yaml rename to site/seaworthy/secrets/passphrases/osh_heat_rabbitmq_erlang_cookie.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_heat_stack_user_password.yaml b/site/seaworthy/secrets/passphrases/osh_heat_stack_user_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_heat_stack_user_password.yaml rename to site/seaworthy/secrets/passphrases/osh_heat_stack_user_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_heat_trustee_password.yaml b/site/seaworthy/secrets/passphrases/osh_heat_trustee_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_heat_trustee_password.yaml rename to site/seaworthy/secrets/passphrases/osh_heat_trustee_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_horizon_oslo_db_password.yaml b/site/seaworthy/secrets/passphrases/osh_horizon_oslo_db_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_horizon_oslo_db_password.yaml rename to site/seaworthy/secrets/passphrases/osh_horizon_oslo_db_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_infra_elasticsearch_admin_password.yaml b/site/seaworthy/secrets/passphrases/osh_infra_elasticsearch_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_infra_elasticsearch_admin_password.yaml rename to site/seaworthy/secrets/passphrases/osh_infra_elasticsearch_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_infra_grafana_admin_password.yaml b/site/seaworthy/secrets/passphrases/osh_infra_grafana_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_infra_grafana_admin_password.yaml rename to site/seaworthy/secrets/passphrases/osh_infra_grafana_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_infra_grafana_oslo_db_password.yaml b/site/seaworthy/secrets/passphrases/osh_infra_grafana_oslo_db_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_infra_grafana_oslo_db_password.yaml rename to site/seaworthy/secrets/passphrases/osh_infra_grafana_oslo_db_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_infra_grafana_oslo_db_session_password.yaml b/site/seaworthy/secrets/passphrases/osh_infra_grafana_oslo_db_session_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_infra_grafana_oslo_db_session_password.yaml rename to site/seaworthy/secrets/passphrases/osh_infra_grafana_oslo_db_session_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_infra_nagios_admin_password.yaml b/site/seaworthy/secrets/passphrases/osh_infra_nagios_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_infra_nagios_admin_password.yaml rename to site/seaworthy/secrets/passphrases/osh_infra_nagios_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_infra_openstack_exporter_password.yaml b/site/seaworthy/secrets/passphrases/osh_infra_openstack_exporter_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_infra_openstack_exporter_password.yaml rename to site/seaworthy/secrets/passphrases/osh_infra_openstack_exporter_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_infra_oslo_db_admin_password.yaml b/site/seaworthy/secrets/passphrases/osh_infra_oslo_db_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_infra_oslo_db_admin_password.yaml rename to site/seaworthy/secrets/passphrases/osh_infra_oslo_db_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_infra_oslo_db_exporter_password.yaml b/site/seaworthy/secrets/passphrases/osh_infra_oslo_db_exporter_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_infra_oslo_db_exporter_password.yaml rename to site/seaworthy/secrets/passphrases/osh_infra_oslo_db_exporter_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_infra_prometheus_admin_password.yaml b/site/seaworthy/secrets/passphrases/osh_infra_prometheus_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_infra_prometheus_admin_password.yaml rename to site/seaworthy/secrets/passphrases/osh_infra_prometheus_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_infra_rgw_s3_admin_access_key.yaml b/site/seaworthy/secrets/passphrases/osh_infra_rgw_s3_admin_access_key.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_infra_rgw_s3_admin_access_key.yaml rename to site/seaworthy/secrets/passphrases/osh_infra_rgw_s3_admin_access_key.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_infra_rgw_s3_admin_secret_key.yaml b/site/seaworthy/secrets/passphrases/osh_infra_rgw_s3_admin_secret_key.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_infra_rgw_s3_admin_secret_key.yaml rename to site/seaworthy/secrets/passphrases/osh_infra_rgw_s3_admin_secret_key.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_access_key.yaml b/site/seaworthy/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_access_key.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_access_key.yaml rename to site/seaworthy/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_access_key.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_secret_key.yaml b/site/seaworthy/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_secret_key.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_secret_key.yaml rename to site/seaworthy/secrets/passphrases/osh_infra_rgw_s3_elasticsearch_secret_key.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_keystone_admin_password.yaml b/site/seaworthy/secrets/passphrases/osh_keystone_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_keystone_admin_password.yaml rename to site/seaworthy/secrets/passphrases/osh_keystone_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_keystone_ldap_password.yaml b/site/seaworthy/secrets/passphrases/osh_keystone_ldap_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_keystone_ldap_password.yaml rename to site/seaworthy/secrets/passphrases/osh_keystone_ldap_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_keystone_oslo_db_password.yaml b/site/seaworthy/secrets/passphrases/osh_keystone_oslo_db_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_keystone_oslo_db_password.yaml rename to site/seaworthy/secrets/passphrases/osh_keystone_oslo_db_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_keystone_oslo_messaging_admin_password.yaml b/site/seaworthy/secrets/passphrases/osh_keystone_oslo_messaging_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_keystone_oslo_messaging_admin_password.yaml rename to site/seaworthy/secrets/passphrases/osh_keystone_oslo_messaging_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_keystone_oslo_messaging_password.yaml b/site/seaworthy/secrets/passphrases/osh_keystone_oslo_messaging_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_keystone_oslo_messaging_password.yaml rename to site/seaworthy/secrets/passphrases/osh_keystone_oslo_messaging_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_keystone_rabbitmq_erlang_cookie.yaml b/site/seaworthy/secrets/passphrases/osh_keystone_rabbitmq_erlang_cookie.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_keystone_rabbitmq_erlang_cookie.yaml rename to site/seaworthy/secrets/passphrases/osh_keystone_rabbitmq_erlang_cookie.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_neutron_oslo_db_password.yaml b/site/seaworthy/secrets/passphrases/osh_neutron_oslo_db_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_neutron_oslo_db_password.yaml rename to site/seaworthy/secrets/passphrases/osh_neutron_oslo_db_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_neutron_oslo_messaging_admin_password.yaml b/site/seaworthy/secrets/passphrases/osh_neutron_oslo_messaging_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_neutron_oslo_messaging_admin_password.yaml rename to site/seaworthy/secrets/passphrases/osh_neutron_oslo_messaging_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_neutron_oslo_messaging_password.yaml b/site/seaworthy/secrets/passphrases/osh_neutron_oslo_messaging_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_neutron_oslo_messaging_password.yaml rename to site/seaworthy/secrets/passphrases/osh_neutron_oslo_messaging_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_neutron_password.yaml b/site/seaworthy/secrets/passphrases/osh_neutron_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_neutron_password.yaml rename to site/seaworthy/secrets/passphrases/osh_neutron_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_neutron_rabbitmq_erlang_cookie.yaml b/site/seaworthy/secrets/passphrases/osh_neutron_rabbitmq_erlang_cookie.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_neutron_rabbitmq_erlang_cookie.yaml rename to site/seaworthy/secrets/passphrases/osh_neutron_rabbitmq_erlang_cookie.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_nova_metadata_proxy_shared_secret.yaml b/site/seaworthy/secrets/passphrases/osh_nova_metadata_proxy_shared_secret.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_nova_metadata_proxy_shared_secret.yaml rename to site/seaworthy/secrets/passphrases/osh_nova_metadata_proxy_shared_secret.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_nova_oslo_db_password.yaml b/site/seaworthy/secrets/passphrases/osh_nova_oslo_db_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_nova_oslo_db_password.yaml rename to site/seaworthy/secrets/passphrases/osh_nova_oslo_db_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_nova_oslo_messaging_admin_password.yaml b/site/seaworthy/secrets/passphrases/osh_nova_oslo_messaging_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_nova_oslo_messaging_admin_password.yaml rename to site/seaworthy/secrets/passphrases/osh_nova_oslo_messaging_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_nova_oslo_messaging_password.yaml b/site/seaworthy/secrets/passphrases/osh_nova_oslo_messaging_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_nova_oslo_messaging_password.yaml rename to site/seaworthy/secrets/passphrases/osh_nova_oslo_messaging_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_nova_password.yaml b/site/seaworthy/secrets/passphrases/osh_nova_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_nova_password.yaml rename to site/seaworthy/secrets/passphrases/osh_nova_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_nova_rabbitmq_erlang_cookie.yaml b/site/seaworthy/secrets/passphrases/osh_nova_rabbitmq_erlang_cookie.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_nova_rabbitmq_erlang_cookie.yaml rename to site/seaworthy/secrets/passphrases/osh_nova_rabbitmq_erlang_cookie.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_oslo_cache_secret_key.yaml b/site/seaworthy/secrets/passphrases/osh_oslo_cache_secret_key.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_oslo_cache_secret_key.yaml rename to site/seaworthy/secrets/passphrases/osh_oslo_cache_secret_key.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_oslo_db_admin_password.yaml b/site/seaworthy/secrets/passphrases/osh_oslo_db_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_oslo_db_admin_password.yaml rename to site/seaworthy/secrets/passphrases/osh_oslo_db_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_oslo_db_exporter_password.yaml b/site/seaworthy/secrets/passphrases/osh_oslo_db_exporter_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_oslo_db_exporter_password.yaml rename to site/seaworthy/secrets/passphrases/osh_oslo_db_exporter_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_placement_password.yaml b/site/seaworthy/secrets/passphrases/osh_placement_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_placement_password.yaml rename to site/seaworthy/secrets/passphrases/osh_placement_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/osh_tempest_password.yaml b/site/seaworthy/secrets/passphrases/osh_tempest_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/osh_tempest_password.yaml rename to site/seaworthy/secrets/passphrases/osh_tempest_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/tenant_ceph_fsid.yaml b/site/seaworthy/secrets/passphrases/tenant_ceph_fsid.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/tenant_ceph_fsid.yaml rename to site/seaworthy/secrets/passphrases/tenant_ceph_fsid.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ubuntu_crypt_password.yaml b/site/seaworthy/secrets/passphrases/ubuntu_crypt_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ubuntu_crypt_password.yaml rename to site/seaworthy/secrets/passphrases/ubuntu_crypt_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml b/site/seaworthy/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_airflow_postgres_password.yaml b/site/seaworthy/secrets/passphrases/ucp_airflow_postgres_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_airflow_postgres_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_airflow_postgres_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_armada_keystone_password.yaml b/site/seaworthy/secrets/passphrases/ucp_armada_keystone_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_armada_keystone_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_armada_keystone_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_barbican_keystone_password.yaml b/site/seaworthy/secrets/passphrases/ucp_barbican_keystone_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_barbican_keystone_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_barbican_keystone_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_barbican_oslo_db_password.yaml b/site/seaworthy/secrets/passphrases/ucp_barbican_oslo_db_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_barbican_oslo_db_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_barbican_oslo_db_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_deckhand_keystone_password.yaml b/site/seaworthy/secrets/passphrases/ucp_deckhand_keystone_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_deckhand_keystone_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_deckhand_keystone_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_deckhand_postgres_password.yaml b/site/seaworthy/secrets/passphrases/ucp_deckhand_postgres_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_deckhand_postgres_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_deckhand_postgres_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_drydock_keystone_password.yaml b/site/seaworthy/secrets/passphrases/ucp_drydock_keystone_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_drydock_keystone_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_drydock_keystone_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_drydock_postgres_password.yaml b/site/seaworthy/secrets/passphrases/ucp_drydock_postgres_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_drydock_postgres_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_drydock_postgres_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_keystone_admin_password.yaml b/site/seaworthy/secrets/passphrases/ucp_keystone_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_keystone_admin_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_keystone_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_keystone_oslo_db_password.yaml b/site/seaworthy/secrets/passphrases/ucp_keystone_oslo_db_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_keystone_oslo_db_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_keystone_oslo_db_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_maas_admin_password.yaml b/site/seaworthy/secrets/passphrases/ucp_maas_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_maas_admin_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_maas_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_maas_postgres_password.yaml b/site/seaworthy/secrets/passphrases/ucp_maas_postgres_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_maas_postgres_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_maas_postgres_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_openstack_exporter_keystone_password.yaml b/site/seaworthy/secrets/passphrases/ucp_openstack_exporter_keystone_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_openstack_exporter_keystone_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_openstack_exporter_keystone_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_oslo_db_admin_password.yaml b/site/seaworthy/secrets/passphrases/ucp_oslo_db_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_oslo_db_admin_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_oslo_db_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_oslo_messaging_password.yaml b/site/seaworthy/secrets/passphrases/ucp_oslo_messaging_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_oslo_messaging_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_oslo_messaging_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_postgres_admin_password.yaml b/site/seaworthy/secrets/passphrases/ucp_postgres_admin_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_postgres_admin_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_postgres_admin_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_promenade_keystone_password.yaml b/site/seaworthy/secrets/passphrases/ucp_promenade_keystone_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_promenade_keystone_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_promenade_keystone_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_rabbitmq_erlang_cookie.yaml b/site/seaworthy/secrets/passphrases/ucp_rabbitmq_erlang_cookie.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_rabbitmq_erlang_cookie.yaml rename to site/seaworthy/secrets/passphrases/ucp_rabbitmq_erlang_cookie.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_shipyard_keystone_password.yaml b/site/seaworthy/secrets/passphrases/ucp_shipyard_keystone_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_shipyard_keystone_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_shipyard_keystone_password.yaml diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_shipyard_postgres_password.yaml b/site/seaworthy/secrets/passphrases/ucp_shipyard_postgres_password.yaml similarity index 100% rename from site/airship-seaworthy/secrets/passphrases/ucp_shipyard_postgres_password.yaml rename to site/seaworthy/secrets/passphrases/ucp_shipyard_postgres_password.yaml diff --git a/site/airship-seaworthy/site-definition.yaml b/site/seaworthy/site-definition.yaml similarity index 93% rename from site/airship-seaworthy/site-definition.yaml rename to site/seaworthy/site-definition.yaml index 9079f1bd9..58fd705d7 100644 --- a/site/airship-seaworthy/site-definition.yaml +++ b/site/seaworthy/site-definition.yaml @@ -7,7 +7,7 @@ metadata: abstract: false layer: site # NEWSITE-CHANGEME: Replace with the site name - name: airship-seaworthy + name: seaworthy storagePolicy: cleartext data: # The type layer this site will delpoy with. Type layer is found in the diff --git a/site/airship-seaworthy/software/charts/kubernetes/container-networking/etcd.yaml b/site/seaworthy/software/charts/kubernetes/container-networking/etcd.yaml similarity index 100% rename from site/airship-seaworthy/software/charts/kubernetes/container-networking/etcd.yaml rename to site/seaworthy/software/charts/kubernetes/container-networking/etcd.yaml diff --git a/site/airship-seaworthy/software/charts/kubernetes/etcd/etcd.yaml b/site/seaworthy/software/charts/kubernetes/etcd/etcd.yaml similarity index 100% rename from site/airship-seaworthy/software/charts/kubernetes/etcd/etcd.yaml rename to site/seaworthy/software/charts/kubernetes/etcd/etcd.yaml diff --git a/site/airship-seaworthy/software/charts/kubernetes/ingress/ingress.yaml b/site/seaworthy/software/charts/kubernetes/ingress/ingress.yaml similarity index 100% rename from site/airship-seaworthy/software/charts/kubernetes/ingress/ingress.yaml rename to site/seaworthy/software/charts/kubernetes/ingress/ingress.yaml diff --git a/site/airship-seaworthy/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml b/site/seaworthy/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml similarity index 100% rename from site/airship-seaworthy/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml rename to site/seaworthy/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml diff --git a/site/airship-seaworthy/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml b/site/seaworthy/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml similarity index 100% rename from site/airship-seaworthy/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml rename to site/seaworthy/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml diff --git a/site/airship-seaworthy/software/charts/osh/openstack-compute-kit/neutron.yaml b/site/seaworthy/software/charts/osh/openstack-compute-kit/neutron.yaml similarity index 100% rename from site/airship-seaworthy/software/charts/osh/openstack-compute-kit/neutron.yaml rename to site/seaworthy/software/charts/osh/openstack-compute-kit/neutron.yaml diff --git a/site/airship-seaworthy/software/charts/osh/openstack-compute-kit/nova.yaml b/site/seaworthy/software/charts/osh/openstack-compute-kit/nova.yaml similarity index 100% rename from site/airship-seaworthy/software/charts/osh/openstack-compute-kit/nova.yaml rename to site/seaworthy/software/charts/osh/openstack-compute-kit/nova.yaml diff --git a/site/airship-seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-client.yaml b/site/seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-client.yaml similarity index 100% rename from site/airship-seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-client.yaml rename to site/seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-client.yaml diff --git a/site/airship-seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml b/site/seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml similarity index 100% rename from site/airship-seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml rename to site/seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml diff --git a/site/airship-seaworthy/software/charts/ucp/ceph/ceph-client-update.yaml b/site/seaworthy/software/charts/ucp/ceph/ceph-client-update.yaml similarity index 100% rename from site/airship-seaworthy/software/charts/ucp/ceph/ceph-client-update.yaml rename to site/seaworthy/software/charts/ucp/ceph/ceph-client-update.yaml diff --git a/site/airship-seaworthy/software/charts/ucp/ceph/ceph-client.yaml b/site/seaworthy/software/charts/ucp/ceph/ceph-client.yaml similarity index 100% rename from site/airship-seaworthy/software/charts/ucp/ceph/ceph-client.yaml rename to site/seaworthy/software/charts/ucp/ceph/ceph-client.yaml diff --git a/site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd.yaml b/site/seaworthy/software/charts/ucp/ceph/ceph-osd.yaml similarity index 100% rename from site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd.yaml rename to site/seaworthy/software/charts/ucp/ceph/ceph-osd.yaml diff --git a/site/airship-seaworthy/software/charts/ucp/divingbell/divingbell.yaml b/site/seaworthy/software/charts/ucp/divingbell/divingbell.yaml similarity index 100% rename from site/airship-seaworthy/software/charts/ucp/divingbell/divingbell.yaml rename to site/seaworthy/software/charts/ucp/divingbell/divingbell.yaml diff --git a/site/airship-seaworthy/software/charts/ucp/drydock/drydock.yaml b/site/seaworthy/software/charts/ucp/drydock/drydock.yaml similarity index 100% rename from site/airship-seaworthy/software/charts/ucp/drydock/drydock.yaml rename to site/seaworthy/software/charts/ucp/drydock/drydock.yaml diff --git a/site/airship-seaworthy/software/charts/ucp/promenade/promenade.yaml b/site/seaworthy/software/charts/ucp/promenade/promenade.yaml similarity index 100% rename from site/airship-seaworthy/software/charts/ucp/promenade/promenade.yaml rename to site/seaworthy/software/charts/ucp/promenade/promenade.yaml diff --git a/site/airship-seaworthy/software/config/common-software-config.yaml b/site/seaworthy/software/config/common-software-config.yaml similarity index 91% rename from site/airship-seaworthy/software/config/common-software-config.yaml rename to site/seaworthy/software/config/common-software-config.yaml index 8bc0c436e..620e4ace7 100644 --- a/site/airship-seaworthy/software/config/common-software-config.yaml +++ b/site/seaworthy/software/config/common-software-config.yaml @@ -12,5 +12,5 @@ metadata: data: osh: # NEWSITE-CHANGEME: Replace with the site name - region_name: airship-seaworthy + region_name: seaworthy ... diff --git a/site/airship-seaworthy/software/config/endpoints.yaml b/site/seaworthy/software/config/endpoints.yaml similarity index 100% rename from site/airship-seaworthy/software/config/endpoints.yaml rename to site/seaworthy/software/config/endpoints.yaml diff --git a/site/airship-seaworthy/software/config/service_accounts.yaml b/site/seaworthy/software/config/service_accounts.yaml similarity index 100% rename from site/airship-seaworthy/software/config/service_accounts.yaml rename to site/seaworthy/software/config/service_accounts.yaml diff --git a/tools/gate/Jenkinsfile b/tools/gate/Jenkinsfile index 702a24a12..4ff9040ba 100644 --- a/tools/gate/Jenkinsfile +++ b/tools/gate/Jenkinsfile @@ -19,11 +19,11 @@ BUNDLE_DIR = 'bundle' KEYSTONE_URL = 'https://iam-sw.atlantafoundry.com' SHIPYARD_URL = 'https://shipyard-sw.atlantafoundry.com/api/v1.0' -SITE_NAME='airship-seaworthy' -IPMI_CREDS = 'airship-seaworthy-ipmi' +SITE_NAME='seaworthy' +IPMI_CREDS = 'seaworthy-ipmi' GENESIS_IP = '10.23.21.11' -GENESIS_CREDS = 'airship-seaworthy-key' +GENESIS_CREDS = 'seaworthy-key' GENESIS_IPMI_IP = '10.23.104.11' GENESIS_CEPH_DISKS = ['b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k'] @@ -110,8 +110,8 @@ def resolve_versions = { def pegleg_site_collect = { stage('Pegleg Site Collect') { - configFileProvider([configFile(fileId: 'airship-seaworthy-site-definition', - targetLocation: 'site/airship-seaworthy/site-definition.yaml')]) { + configFileProvider([configFile(fileId: 'seaworthy-site-definition', + targetLocation: 'site/seaworthy/site-definition.yaml')]) { } withCredentials([sshUserPrivateKey(credentialsId: 'jenkins-attcomdev-key', @@ -154,7 +154,7 @@ def genesis_cleanup = { BUNDLE_DIR, "${BUNDLE_DIR}.tar.gz", SITE_NAME, - 'airship-seaworthy.tar.gz', + 'seaworthy.tar.gz', 'debug-cab23-r720-11.tgz', '/var/lib/docker', '/var/lib/kubelet'] @@ -288,7 +288,7 @@ def sanity_tests = { 'OSH_EXT_SUBNET=', 'OSH_BR_EX_ADDR=', 'OSH_KEYSTONE_URL=https://identity-sw.atlantafoundry.com/v3', - 'OSH_REGION_NAME=airship-seaworthy', + 'OSH_REGION_NAME=seaworthy', 'OSH_ADMIN_PASSWD=password123']) { sh 'tools/tests.sh' } diff --git a/tools/gate/seed.groovy b/tools/gate/seed.groovy index 245e890dc..8192589af 100644 --- a/tools/gate/seed.groovy +++ b/tools/gate/seed.groovy @@ -1,5 +1,5 @@ -pipelineJob('airship-seaworthy') { +pipelineJob('seaworthy') { displayName('Airship Seaworthy') description('Bare-metal continuous deployment pipeline') @@ -11,7 +11,7 @@ pipelineJob('airship-seaworthy') { parameters { string { defaultValue("uplift") - description("Reference to airship-treasuremap, e.g. refs/changes/12/12345/12") + description("Reference to treasuremap, e.g. refs/changes/12/12345/12") name("AIRSHIP_MANIFESTS_REF") trim(true) } @@ -36,7 +36,7 @@ pipelineJob('airship-seaworthy') { gerritProjects { gerritProject { compareType('PLAIN') - pattern("openstack/airship-treasuremap") + pattern("airship/treasuremap") branches { branch { compareType("ANT")