Update Makefile for GCP and Azure switch (#81)
* update Makefile for multi-cloud switch * update sub-modules
This commit is contained in:
Родитель
7f8ca02a80
Коммит
0152238bdf
8
Makefile
8
Makefile
|
@ -53,11 +53,11 @@ build-terraform:
|
|||
@if [ -z "$(RESOURCE)" ]; then \
|
||||
echo "==> Generating source code for terraform from resource list..."; \
|
||||
cd $(MMROOT) && \
|
||||
jq '.[]' $(ROOT)/resources.json | xargs -I '{}' bundle exec compiler -d -p $(SPECROOT)/'{}' -e terraform -o $(TFROOT)/$(TFREPO)/; \
|
||||
jq '.[]' $(ROOT)/resources.json | xargs -I '{}' bundle exec compiler -d -p $(SPECROOT)/'{}' -e terraform -c azure -o $(TFROOT)/$(TFREPO)/; \
|
||||
else \
|
||||
echo "==> Generating source code for terraform from given name..."; \
|
||||
cd $(MMROOT) && \
|
||||
bundle exec compiler -d -p $(SPECROOT)/$(RESOURCE) -e terraform -o $(TFROOT)/$(TFREPO)/; \
|
||||
bundle exec compiler -d -p $(SPECROOT)/$(RESOURCE) -e terraform -c azure -o $(TFROOT)/$(TFREPO)/; \
|
||||
fi
|
||||
|
||||
format-terraform:
|
||||
|
@ -71,11 +71,11 @@ build-ansible:
|
|||
@if [ -z "$(RESOURCE)" ]; then \
|
||||
echo "==> Generating source code for ansible from resource list..."; \
|
||||
cd $(MMROOT) && \
|
||||
jq '.[]' $(ROOT)/resources.json | xargs -I '{}' bundle exec compiler -d -p $(SPECROOT)/'{}' -e ansible -o $(GENROOT)/$(ASREPO)/; \
|
||||
jq '.[]' $(ROOT)/resources.json | xargs -I '{}' bundle exec compiler -d -p $(SPECROOT)/'{}' -e ansible -c azure -o $(GENROOT)/$(ASREPO)/; \
|
||||
else \
|
||||
echo "==> Generating source code for ansible from given name..."; \
|
||||
cd $(MMROOT) && \
|
||||
bundle exec compiler -d -p $(SPECROOT)/$(RESOURCE) -e ansible -o $(GENROOT)/$(ASREPO)/; \
|
||||
bundle exec compiler -d -p $(SPECROOT)/$(RESOURCE) -e ansible -c azure -o $(GENROOT)/$(ASREPO)/; \
|
||||
fi
|
||||
|
||||
.PHONY: init clean build build-terraform format-terraform build-ansible
|
|
@ -1 +1 @@
|
|||
Subproject commit 53b4d053121709d6b7851321b015d68345a25fdc
|
||||
Subproject commit cff643d601d5e7f6e7e47233f61122d642767943
|
Загрузка…
Ссылка в новой задаче