diff --git a/tools/deployment/baremetal/040-mariadb.sh b/tools/deployment/baremetal/040-mariadb.sh deleted file mode 100755 index f536915a5e..0000000000 --- a/tools/deployment/baremetal/040-mariadb.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Copyright 2017 The Openstack-Helm Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -xe - -#NOTE: Pull images and lint chart -make pull-images mariadb - -#NOTE: Deploy command -helm install ./mariadb \ - --namespace=openstack \ - --name=mariadb \ - --set pod.replicas.server=1 - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status mariadb diff --git a/tools/deployment/baremetal/040-mariadb.sh b/tools/deployment/baremetal/040-mariadb.sh new file mode 120000 index 0000000000..610a382acc --- /dev/null +++ b/tools/deployment/baremetal/040-mariadb.sh @@ -0,0 +1 @@ +../developer/common/050-mariadb.sh \ No newline at end of file diff --git a/tools/deployment/baremetal/050-rabbitmq.sh b/tools/deployment/baremetal/050-rabbitmq.sh deleted file mode 100755 index bbc38f596a..0000000000 --- a/tools/deployment/baremetal/050-rabbitmq.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Copyright 2017 The Openstack-Helm Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -xe - -#NOTE: Pull images and lint chart -make pull-images rabbitmq - -#NOTE: Deploy command -helm install ./rabbitmq \ - --namespace=openstack \ - --name=rabbitmq \ - --set pod.replicas.server=1 - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status rabbitmq diff --git a/tools/deployment/baremetal/050-rabbitmq.sh b/tools/deployment/baremetal/050-rabbitmq.sh new file mode 120000 index 0000000000..c0f0d249e2 --- /dev/null +++ b/tools/deployment/baremetal/050-rabbitmq.sh @@ -0,0 +1 @@ +../developer/common/060-rabbitmq.sh \ No newline at end of file diff --git a/tools/deployment/baremetal/060-memcached.sh b/tools/deployment/baremetal/060-memcached.sh deleted file mode 100755 index d25927b074..0000000000 --- a/tools/deployment/baremetal/060-memcached.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -# Copyright 2017 The Openstack-Helm Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -xe - -#NOTE: Pull images and lint chart -make pull-images memcached - -#NOTE: Deploy command -helm install ./memcached \ - --namespace=openstack \ - --name=memcached - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status memcached diff --git a/tools/deployment/baremetal/060-memcached.sh b/tools/deployment/baremetal/060-memcached.sh new file mode 120000 index 0000000000..9592670f70 --- /dev/null +++ b/tools/deployment/baremetal/060-memcached.sh @@ -0,0 +1 @@ +../common/memcached.sh \ No newline at end of file diff --git a/tools/deployment/baremetal/080-keystone.sh b/tools/deployment/baremetal/080-keystone.sh deleted file mode 100755 index e23c6d0410..0000000000 --- a/tools/deployment/baremetal/080-keystone.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# Copyright 2017 The Openstack-Helm Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -xe - -#NOTE: Pull images and lint chart -make pull-images keystone - -#NOTE: Deploy command -helm install ./keystone \ - --namespace=openstack \ - --name=keystone - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status keystone -export OS_CLOUD=openstack_helm -sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx -openstack endpoint list diff --git a/tools/deployment/baremetal/080-keystone.sh b/tools/deployment/baremetal/080-keystone.sh new file mode 120000 index 0000000000..8b49a2dbba --- /dev/null +++ b/tools/deployment/baremetal/080-keystone.sh @@ -0,0 +1 @@ +../developer/common/080-keystone.sh \ No newline at end of file diff --git a/tools/deployment/baremetal/090-glance.sh b/tools/deployment/baremetal/090-glance.sh deleted file mode 100755 index b10b34ba2c..0000000000 --- a/tools/deployment/baremetal/090-glance.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -# Copyright 2017 The Openstack-Helm Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -xe - -#NOTE: Pull images and lint chart -make pull-images glance - -#NOTE: Deploy command -helm install ./glance \ - --namespace=openstack \ - --name=glance \ - --set storage=radosgw - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status glance -export OS_CLOUD=openstack_helm -openstack service list -sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx -openstack image list -openstack image show 'Cirros 0.3.5 64-bit' diff --git a/tools/deployment/baremetal/090-glance.sh b/tools/deployment/baremetal/090-glance.sh new file mode 120000 index 0000000000..61557db6cb --- /dev/null +++ b/tools/deployment/baremetal/090-glance.sh @@ -0,0 +1 @@ +../developer/ceph/120-glance.sh \ No newline at end of file diff --git a/tools/deployment/baremetal/100-heat.sh b/tools/deployment/baremetal/100-heat.sh deleted file mode 100755 index 073ecf5b61..0000000000 --- a/tools/deployment/baremetal/100-heat.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -# Copyright 2017 The Openstack-Helm Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -set -xe - -#NOTE: Pull images and lint chart -make pull-images heat - -#NOTE: Deploy command -helm install ./heat \ - --namespace=openstack \ - --name=heat - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -export OS_CLOUD=openstack_helm -openstack service list -sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx -openstack orchestration service list diff --git a/tools/deployment/baremetal/100-heat.sh b/tools/deployment/baremetal/100-heat.sh new file mode 120000 index 0000000000..646c44c3cd --- /dev/null +++ b/tools/deployment/baremetal/100-heat.sh @@ -0,0 +1 @@ +../developer/common/090-heat.sh \ No newline at end of file