Fixes for UCP deployment
- Update Armada default image to armada:latest instead of armada:master as the master tag is no longer applied to builds - Add the Foundry Artifactory as a insecure registry - Update the drydock sample Deckhand-based topology document to reflect valid Deckhand documents - Remove the cephfs_provisioner from the ceph client namespace chart - Update the Ceph chart to specify valid job deletion hooks - Remove the dependencies from the Ceph chart as the chart defaults now care for this. Change-Id: Idf7e91da97e758ed0f55e30cbc0248f532ae643a
This commit is contained in:
parent
4b03603443
commit
7e8e972908
|
@ -10,6 +10,7 @@ data:
|
||||||
config:
|
config:
|
||||||
insecure-registries:
|
insecure-registries:
|
||||||
- registry:5000
|
- registry:5000
|
||||||
|
- 10.24.20.19:30092
|
||||||
live-restore: true
|
live-restore: true
|
||||||
storage-driver: overlay2
|
storage-driver: overlay2
|
||||||
...
|
...
|
||||||
|
|
|
@ -35,64 +35,31 @@ data:
|
||||||
no_hooks: false
|
no_hooks: false
|
||||||
pre:
|
pre:
|
||||||
delete:
|
delete:
|
||||||
- name: ceph-bootstrap
|
- type: job
|
||||||
type: job
|
|
||||||
labels:
|
labels:
|
||||||
- application: ceph
|
application: ceph
|
||||||
- component: bootstrap
|
component: bootstrap
|
||||||
- release_group: armada-ucp
|
- type: job
|
||||||
- name: ceph-mds-keyring-generator
|
|
||||||
type: job
|
|
||||||
labels:
|
labels:
|
||||||
- application: ceph
|
application: ceph
|
||||||
- component: mds-keyring-generator
|
component: mds-keyring-generator
|
||||||
- release_group: armada-ucp
|
- type: job
|
||||||
- name: ceph-mon-keyring-generator
|
|
||||||
type: job
|
|
||||||
labels:
|
labels:
|
||||||
- application: ceph
|
application: ceph
|
||||||
- component: mon-keyring-generator
|
component: mon-keyring-generator
|
||||||
- release_group: armada-ucp
|
- type: job
|
||||||
- name: ceph-rgw-keyring-generator
|
|
||||||
type: job
|
|
||||||
labels:
|
labels:
|
||||||
- application: ceph
|
application: ceph
|
||||||
- component: rgw-keyring-generator
|
component: rgw-keyring-generator
|
||||||
- release_group: armada-ucp
|
- type: job
|
||||||
- name: ceph-storage-keys-generator
|
|
||||||
type: job
|
|
||||||
labels:
|
labels:
|
||||||
- application: ceph
|
application: ceph
|
||||||
- component: storage-keys-generator
|
component: storage-keys-generator
|
||||||
- release_group: armada-ucp
|
- type: job
|
||||||
- name: ceph-osd-keyring-generator
|
|
||||||
type: job
|
|
||||||
labels:
|
labels:
|
||||||
- application: ceph
|
application: ceph
|
||||||
- component: osd-keyring-generator
|
component: osd-keyring-generator
|
||||||
- release_group: armada-ucp
|
|
||||||
values:
|
values:
|
||||||
dependencies:
|
|
||||||
mgr:
|
|
||||||
jobs:
|
|
||||||
- 'ceph-storage-keys-generator'
|
|
||||||
- 'ceph-mgr-keyring-generator'
|
|
||||||
mon:
|
|
||||||
jobs:
|
|
||||||
- 'ceph-storage-keys-generator'
|
|
||||||
- 'ceph-mon-keyring-generator'
|
|
||||||
osd:
|
|
||||||
jobs:
|
|
||||||
- 'ceph-storage-keys-generator'
|
|
||||||
- 'ceph-osd-keyring-generator'
|
|
||||||
rgw:
|
|
||||||
jobs:
|
|
||||||
- 'ceph-storage-keys-generator'
|
|
||||||
- 'ceph-rgw-keyring-generator'
|
|
||||||
mds:
|
|
||||||
jobs:
|
|
||||||
- 'ceph-storage-keys-generator'
|
|
||||||
- 'ceph-mds-keyring-generator'
|
|
||||||
conf:
|
conf:
|
||||||
ceph:
|
ceph:
|
||||||
config:
|
config:
|
||||||
|
@ -120,6 +87,7 @@ data:
|
||||||
storage_secrets: true
|
storage_secrets: true
|
||||||
ceph: true
|
ceph: true
|
||||||
rbd_provisioner: true
|
rbd_provisioner: true
|
||||||
|
cephfs_provisioner: true
|
||||||
client_secrets: false
|
client_secrets: false
|
||||||
rgw_keystone_user_and_endpoints: false
|
rgw_keystone_user_and_endpoints: false
|
||||||
bootstrap:
|
bootstrap:
|
||||||
|
@ -147,12 +115,10 @@ data:
|
||||||
no_hooks: false
|
no_hooks: false
|
||||||
pre:
|
pre:
|
||||||
delete:
|
delete:
|
||||||
- name: ceph-namespace-client-key-generator
|
- type: job
|
||||||
type: job
|
|
||||||
labels:
|
labels:
|
||||||
- application: ceph
|
application: ceph
|
||||||
- component: namespace-client-key-generator
|
component: namespace-client-key-generator
|
||||||
- release_group: armada-ucp
|
|
||||||
values:
|
values:
|
||||||
labels:
|
labels:
|
||||||
jobs:
|
jobs:
|
||||||
|
@ -174,6 +140,7 @@ data:
|
||||||
storage_secrets: false
|
storage_secrets: false
|
||||||
ceph: false
|
ceph: false
|
||||||
rbd_provisioner: false
|
rbd_provisioner: false
|
||||||
|
cephfs_provisioner: false
|
||||||
client_secrets: true
|
client_secrets: true
|
||||||
rgw_keystone_user_and_endpoints: false
|
rgw_keystone_user_and_endpoints: false
|
||||||
source:
|
source:
|
||||||
|
|
|
@ -95,8 +95,8 @@ function init_env {
|
||||||
|
|
||||||
# Images
|
# Images
|
||||||
export TILLER_IMAGE=${TILLER_IMAGE:-"gcr.io/kubernetes-helm/tiller:v2.7.2"}
|
export TILLER_IMAGE=${TILLER_IMAGE:-"gcr.io/kubernetes-helm/tiller:v2.7.2"}
|
||||||
export DRYDOCK_IMAGE=${DRYDOCK_IMAGE:-"quay.io/attcomdev/drydock:master"}
|
export DRYDOCK_IMAGE=${DRYDOCK_IMAGE:-"quay.io/attcomdev/drydock:latest"}
|
||||||
export ARMADA_IMAGE=${ARMADA_IMAGE:-"quay.io/attcomdev/armada:master"}
|
export ARMADA_IMAGE=${ARMADA_IMAGE:-"quay.io/attcomdev/armada:latest"}
|
||||||
export PROMENADE_IMAGE=${PROMENADE_IMAGE:-"quay.io/attcomdev/promenade:master"}
|
export PROMENADE_IMAGE=${PROMENADE_IMAGE:-"quay.io/attcomdev/promenade:master"}
|
||||||
export DECKHAND_IMAGE=${DECKHAND_IMAGE:-"quay.io/attcomdev/deckhand:master"}
|
export DECKHAND_IMAGE=${DECKHAND_IMAGE:-"quay.io/attcomdev/deckhand:master"}
|
||||||
export SHIPYARD_IMAGE=${SHIPYARD_IMAGE:-"quay.io/attcomdev/shipyard:master"}
|
export SHIPYARD_IMAGE=${SHIPYARD_IMAGE:-"quay.io/attcomdev/shipyard:master"}
|
||||||
|
|
|
@ -12,10 +12,24 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
---
|
---
|
||||||
|
schema: deckhand/LayeringPolicy/v1
|
||||||
|
metadata:
|
||||||
|
schema: metadata/Control/v1
|
||||||
|
name: layering-policy
|
||||||
|
layeringDefinition:
|
||||||
|
abstract: false
|
||||||
|
layer: site
|
||||||
|
data:
|
||||||
|
layerOrder:
|
||||||
|
- site
|
||||||
|
---
|
||||||
schema: 'drydock/Region/v1'
|
schema: 'drydock/Region/v1'
|
||||||
metadata:
|
metadata:
|
||||||
schema: 'metadata/Document/v1'
|
schema: 'metadata/Document/v1'
|
||||||
name: atl_foundry
|
name: atl_foundry
|
||||||
|
layeringDefinition:
|
||||||
|
abstract: false
|
||||||
|
layer: site
|
||||||
data:
|
data:
|
||||||
tag_definitions:
|
tag_definitions:
|
||||||
- tag: 'high_memory'
|
- tag: 'high_memory'
|
||||||
|
@ -32,6 +46,9 @@ schema: 'drydock/NetworkLink/v1'
|
||||||
metadata:
|
metadata:
|
||||||
schema: 'metadata/Document/v1'
|
schema: 'metadata/Document/v1'
|
||||||
name: oob
|
name: oob
|
||||||
|
layeringDefinition:
|
||||||
|
abstract: false
|
||||||
|
layer: site
|
||||||
data:
|
data:
|
||||||
labels:
|
labels:
|
||||||
noconfig: 'enabled'
|
noconfig: 'enabled'
|
||||||
|
@ -49,6 +66,9 @@ schema: 'drydock/NetworkLink/v1'
|
||||||
metadata:
|
metadata:
|
||||||
schema: 'metadata/Document/v1'
|
schema: 'metadata/Document/v1'
|
||||||
name: pxe-rack1
|
name: pxe-rack1
|
||||||
|
layeringDefinition:
|
||||||
|
abstract: false
|
||||||
|
layer: site
|
||||||
data:
|
data:
|
||||||
bonding:
|
bonding:
|
||||||
mode: 'disabled'
|
mode: 'disabled'
|
||||||
|
@ -60,10 +80,31 @@ data:
|
||||||
allowed_networks:
|
allowed_networks:
|
||||||
- 'pxe-rack1'
|
- 'pxe-rack1'
|
||||||
---
|
---
|
||||||
|
schema: 'drydock/NetworkLink/v1'
|
||||||
|
metadata:
|
||||||
|
schema: 'metadata/Document/v1'
|
||||||
|
name: mgmt
|
||||||
|
layeringDefinition:
|
||||||
|
abstract: false
|
||||||
|
layer: site
|
||||||
|
data:
|
||||||
|
bonding:
|
||||||
|
mode: 'disabled'
|
||||||
|
mtu: 1500
|
||||||
|
linkspeed: 'auto'
|
||||||
|
trunking:
|
||||||
|
mode: disabled
|
||||||
|
default_network: mgmt
|
||||||
|
allowed_networks:
|
||||||
|
- 'mgmt'
|
||||||
|
---
|
||||||
schema: 'drydock/Network/v1'
|
schema: 'drydock/Network/v1'
|
||||||
metadata:
|
metadata:
|
||||||
schema: 'metadata/Document/v1'
|
schema: 'metadata/Document/v1'
|
||||||
name: oob
|
name: oob
|
||||||
|
layeringDefinition:
|
||||||
|
abstract: false
|
||||||
|
layer: site
|
||||||
data:
|
data:
|
||||||
labels:
|
labels:
|
||||||
noconfig: 'enabled'
|
noconfig: 'enabled'
|
||||||
|
@ -73,6 +114,9 @@ schema: 'drydock/Network/v1'
|
||||||
metadata:
|
metadata:
|
||||||
schema: 'metadata/Document/v1'
|
schema: 'metadata/Document/v1'
|
||||||
name: pxe-rack1
|
name: pxe-rack1
|
||||||
|
layeringDefinition:
|
||||||
|
abstract: false
|
||||||
|
layer: site
|
||||||
data:
|
data:
|
||||||
cidr: '172.24.1.0/24'
|
cidr: '172.24.1.0/24'
|
||||||
routes:
|
routes:
|
||||||
|
@ -90,7 +134,10 @@ data:
|
||||||
schema: 'drydock/Network/v1'
|
schema: 'drydock/Network/v1'
|
||||||
metadata:
|
metadata:
|
||||||
schema: 'metadata/Document/v1'
|
schema: 'metadata/Document/v1'
|
||||||
name: pxe-rack2
|
name: mgmt
|
||||||
|
layeringDefinition:
|
||||||
|
abstract: false
|
||||||
|
layer: site
|
||||||
data:
|
data:
|
||||||
cidr: '172.24.2.0/24'
|
cidr: '172.24.2.0/24'
|
||||||
routes:
|
routes:
|
||||||
|
@ -109,6 +156,9 @@ schema: 'drydock/HardwareProfile/v1'
|
||||||
metadata:
|
metadata:
|
||||||
schema: 'metadata/Document/v1'
|
schema: 'metadata/Document/v1'
|
||||||
name: DellR820v1
|
name: DellR820v1
|
||||||
|
layeringDefinition:
|
||||||
|
abstract: false
|
||||||
|
layer: site
|
||||||
data:
|
data:
|
||||||
vendor: 'Dell'
|
vendor: 'Dell'
|
||||||
generation: '1'
|
generation: '1'
|
||||||
|
@ -127,6 +177,9 @@ schema: 'drydock/HostProfile/v1'
|
||||||
metadata:
|
metadata:
|
||||||
name: defaults
|
name: defaults
|
||||||
schema: 'metadata/Document/v1'
|
schema: 'metadata/Document/v1'
|
||||||
|
layeringDefinition:
|
||||||
|
abstract: false
|
||||||
|
layer: site
|
||||||
data:
|
data:
|
||||||
hardware_profile: 'DellR820v1'
|
hardware_profile: 'DellR820v1'
|
||||||
primary_network: 'pxe-rack1'
|
primary_network: 'pxe-rack1'
|
||||||
|
@ -142,7 +195,7 @@ data:
|
||||||
bootdrive: 'true'
|
bootdrive: 'true'
|
||||||
partitions:
|
partitions:
|
||||||
- name: 'root'
|
- name: 'root'
|
||||||
size: '10g'
|
size: '20g'
|
||||||
bootable: true
|
bootable: true
|
||||||
filesystem:
|
filesystem:
|
||||||
mountpoint: '/'
|
mountpoint: '/'
|
||||||
|
@ -155,12 +208,12 @@ data:
|
||||||
fstype: 'ext4'
|
fstype: 'ext4'
|
||||||
mount_options: 'defaults'
|
mount_options: 'defaults'
|
||||||
interfaces:
|
interfaces:
|
||||||
ens3f0:
|
ens3:
|
||||||
device_link: 'pxe-rack1'
|
device_link: 'mgmt'
|
||||||
slaves:
|
slaves:
|
||||||
- 'ens3f0'
|
- 'ens3f0'
|
||||||
networks:
|
networks:
|
||||||
- 'pxe-rack1'
|
- 'mgmt'
|
||||||
platform:
|
platform:
|
||||||
image: 'ubuntu/xenial'
|
image: 'ubuntu/xenial'
|
||||||
kernel: 'generic'
|
kernel: 'generic'
|
||||||
|
@ -171,11 +224,14 @@ schema: 'drydock/BaremetalNode/v1'
|
||||||
metadata:
|
metadata:
|
||||||
schema: 'metadata/Document/v1'
|
schema: 'metadata/Document/v1'
|
||||||
name: node2
|
name: node2
|
||||||
|
layeringDefinition:
|
||||||
|
abstract: false
|
||||||
|
layer: site
|
||||||
data:
|
data:
|
||||||
host_profile: defaults
|
host_profile: defaults
|
||||||
addressing:
|
addressing:
|
||||||
- network: 'pxe-rack1'
|
- network: 'mgmt'
|
||||||
address: '172.24.1.101'
|
address: '172.24.2.101'
|
||||||
- network: 'oob'
|
- network: 'oob'
|
||||||
address: '172.24.10.101'
|
address: '172.24.10.101'
|
||||||
metadata:
|
metadata:
|
||||||
|
@ -188,6 +244,9 @@ metadata:
|
||||||
schema: 'metadata/Document/v1'
|
schema: 'metadata/Document/v1'
|
||||||
name: promjoin
|
name: promjoin
|
||||||
storagePolicy: 'cleartext'
|
storagePolicy: 'cleartext'
|
||||||
|
layeringDefinition:
|
||||||
|
abstract: false
|
||||||
|
layer: site
|
||||||
labels:
|
labels:
|
||||||
application: 'drydock'
|
application: 'drydock'
|
||||||
data:
|
data:
|
||||||
|
@ -201,7 +260,7 @@ data:
|
||||||
- path: /opt/promjoin.sh
|
- path: /opt/promjoin.sh
|
||||||
type: file
|
type: file
|
||||||
permissions: '555'
|
permissions: '555'
|
||||||
location: http://172.24.1.100:6880/{{node.hostname}}.join
|
location: promenade+http://promenade-api.ucp.svc.cluster.local/ap/v1.0/join-scripts?design_ref={{ action.design_ref }}&hostname={{ node.hostname }}&ip={{ node.network.mgmt.ip }}&{% for k, v in node.labels.items() %}labels.dynamic={{ k }}={{ v }}{% endfor %}
|
||||||
location_pipeline:
|
location_pipeline:
|
||||||
- template
|
- template
|
||||||
data_pipeline:
|
data_pipeline:
|
||||||
|
|
|
@ -5,6 +5,5 @@ export GENESIS_NODE_IP=172.24.1.100
|
||||||
export MASTER_NODE_IP=172.24.1.101
|
export MASTER_NODE_IP=172.24.1.101
|
||||||
export NODE_NET_IFACE=ens3
|
export NODE_NET_IFACE=ens3
|
||||||
export PROMENADE_IMAGE=quay.io/attcomdev/promenade:master
|
export PROMENADE_IMAGE=quay.io/attcomdev/promenade:master
|
||||||
export ARMADA_IMAGE=quay.io/attcomdev/armada:master
|
export ARMADA_IMAGE=quay.io/attcomdev/armada:latest
|
||||||
export DRYDOCK_IMAGE=sthussey/drydock:391039v1
|
export DRYDOCK_IMAGE=quay.io/attcomdev/drydock:latest
|
||||||
export MAAS_CACHE_IMAGE=sthussey/maas-cache:cachetest
|
|
||||||
|
|
Loading…
Reference in New Issue